Leahnaya/cc3dsfs
1
0
Fork 0
mirror of https://github.com/Lorenzooone/cc3dsfs.git synced 2026-08-28 03:24:25 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Print controllers also when closing
Some checks failed
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linux32 flags:32 name:Linux GCC 32 os:ubuntu-latest]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linux64 flags:64 name:Linux GCC x64 os:ubuntu-latest]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linuxarm32 flags:arm32 name:Linux GCC ARM 32 os:ubuntu-latest]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linuxarm64 flags:arm64 name:Linux GCC ARM 64 os:ubuntu-latest]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:macos name:macOS Apple Silicon os:macos-14]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:win32 flags:-A Win32 -DCMAKE_PARALLEL_MSVC=TRUE name:Windows VS2022 Win32 os:windows-2022]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:win64 flags:-A x64 -DCMAKE_PARALLEL_MSVC=TRUE name:Windows VS2022 x64 os:windows-2022]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:winarm64 flags:-A ARM64 -DCMAKE_PARALLEL_MSVC=TRUE name:Windows VS2022 ARM os:windows-2022]) (push) Has been cancelled
Details
CD / Create Pi Mono Setup (push) Has been cancelled
Details
CD / Publishing (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Lorenzooone
2026-04-05 20:32:33 +02:00
parent 4583c9f5bb
commit 3a49fa41a3
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/event_structs.hpp
View File

@@ -37,7 +37,7 @@ struct SFEvent {
};
void joystick_axis_poll(std::queue<SFEvent> &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);

5
source/cc3dsfs.cpp
View File

@@ -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();

8
source/frontend.cpp
View File

@@ -935,7 +935,7 @@ void joystick_axis_poll(std::queue<SFEvent> &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))