diff --git a/include/event_structs.hpp b/include/event_structs.hpp index 82f255f..91079e2 100644 --- a/include/event_structs.hpp +++ b/include/event_structs.hpp @@ -37,7 +37,7 @@ struct SFEvent { }; void joystick_axis_poll(std::queue &events_queue); -void joystick_print_all(); +void joystick_print_all(bool start); JoystickDirection get_joystick_direction(uint32_t joystickId, sf::Joystick::Axis axis, float position); JoystickAction get_joystick_action(uint32_t joystickId, uint32_t joy_button); void init_extra_buttons_poll(int page_up_id, int page_down_id, int enter_id, int power_id, bool use_pud_up); diff --git a/source/cc3dsfs.cpp b/source/cc3dsfs.cpp index 0fab06e..1415f6a 100755 --- a/source/cc3dsfs.cpp +++ b/source/cc3dsfs.cpp @@ -703,7 +703,7 @@ static int mainVideoOutputCall(AudioData* audio_data, CaptureData* capture_data, int no_data_consecutive = 0; if(override_data.print_controller_list) - joystick_print_all(); + joystick_print_all(true); while(capture_data->status.running) { check_for_first_connection(did_first_connection, start_time, capture_data, &frontend_data, force_cc_disables, override_data, out_text_data, ret_val, last_connection_time); @@ -856,6 +856,9 @@ static int mainVideoOutputCall(AudioData* audio_data, CaptureData* capture_data, } } + if(override_data.print_controller_list) + joystick_print_all(false); + top_screen->end(); bot_screen->end(); joint_screen->end(); diff --git a/source/frontend.cpp b/source/frontend.cpp index 8312cca..1f9cbda 100755 --- a/source/frontend.cpp +++ b/source/frontend.cpp @@ -935,7 +935,7 @@ void joystick_axis_poll(std::queue &events_queue) { } } -void joystick_print_all() { +void joystick_print_all(bool start) { int num_connected = 0; for(unsigned int i = 0; i < sf::Joystick::Count; i++) { @@ -943,8 +943,12 @@ void joystick_print_all() { continue; num_connected += 1; } + + std::string initial_str = "Closing "; + if(start) + initial_str = "Starting "; - ActualConsoleOutText("Connected Joysticks: " + std::to_string(num_connected)); + ActualConsoleOutText(initial_str + "Connected Joysticks: " + std::to_string(num_connected)); for(unsigned int i = 0; i < sf::Joystick::Count; i++) { if(!sf::Joystick::isConnected(i))