mirror of
https://github.com/Lorenzooone/cc3dsfs.git
synced 2026-04-19 11:27:24 -05:00
Move Menus to subfolder
This commit is contained in:
parent
4f51c25a24
commit
d33e4b2adb
|
|
@ -132,11 +132,11 @@ file(MAKE_DIRECTORY ${TOOLS_DATA_DIR})
|
|||
set(OUTPUT_NAME cc3dsfs)
|
||||
|
||||
add_executable(CMakeBin2C tools/bin2c.cpp)
|
||||
add_executable(${OUTPUT_NAME} source/cc3dsfs.cpp source/utils.cpp source/audio_data.cpp source/audio.cpp source/frontend.cpp source/TextRectangle.cpp source/WindowScreen.cpp source/3dscapture.cpp source/conversions.cpp source/ConnectionMenu.cpp source/OptionSelectionMenu.cpp source/MainMenu.cpp source/VideoMenu.cpp source/CropMenu.cpp source/PARMenu.cpp source/RotationMenu.cpp source/OffsetMenu.cpp source/AudioMenu.cpp ${TOOLS_DATA_DIR}/font_ttf.cpp)
|
||||
add_executable(${OUTPUT_NAME} source/cc3dsfs.cpp source/utils.cpp source/audio_data.cpp source/audio.cpp source/frontend.cpp source/TextRectangle.cpp source/WindowScreen.cpp source/3dscapture.cpp source/conversions.cpp source/Menus/ConnectionMenu.cpp source/Menus/OptionSelectionMenu.cpp source/Menus/MainMenu.cpp source/Menus/VideoMenu.cpp source/Menus/CropMenu.cpp source/Menus/PARMenu.cpp source/Menus/RotationMenu.cpp source/Menus/OffsetMenu.cpp source/Menus/AudioMenu.cpp ${TOOLS_DATA_DIR}/font_ttf.cpp)
|
||||
add_dependencies(${OUTPUT_NAME} FTD3XX_BUILD_PROJECT CMakeBin2C)
|
||||
target_link_libraries(${OUTPUT_NAME} PRIVATE sfml-graphics sfml-audio sfml-window sfml-system ${ftd3xx_BINARY_DIR}/${FTD3XX_SUBFOLDER}/${FTD3XX_LIB})
|
||||
target_link_directories(${OUTPUT_NAME} PRIVATE ${ftd3xx_BINARY_DIR}/${FTD3XX_SUBFOLDER})
|
||||
target_include_directories(${OUTPUT_NAME} PRIVATE ${ftd3xx_BINARY_DIR}/${FTD3XX_SUBFOLDER} ${TOOLS_DATA_DIR} ${CMAKE_SOURCE_DIR}/include)
|
||||
target_include_directories(${OUTPUT_NAME} PRIVATE ${ftd3xx_BINARY_DIR}/${FTD3XX_SUBFOLDER} ${TOOLS_DATA_DIR} ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include/Menus)
|
||||
target_compile_features(${OUTPUT_NAME} PRIVATE cxx_std_20)
|
||||
target_compile_options(${OUTPUT_NAME} PRIVATE ${EXTRA_LINUX_CXX_FLAGS})
|
||||
target_compile_features(CMakeBin2C PRIVATE cxx_std_17)
|
||||
|
|
|
|||
|
|
@ -673,6 +673,33 @@ void WindowScreen::poll() {
|
|||
continue;
|
||||
}
|
||||
break;
|
||||
case AUDIO_MENU_TYPE:
|
||||
if(this->audio_menu->poll(event_data)) {
|
||||
switch(this->audio_menu->selected_index) {
|
||||
case AUDIO_MENU_BACK:
|
||||
this->setup_main_menu();
|
||||
return;
|
||||
case AUDIO_MENU_NO_ACTION:
|
||||
break;
|
||||
case AUDIO_MENU_VOLUME_DEC:
|
||||
this->audio_data->change_audio_volume(false);
|
||||
break;
|
||||
case AUDIO_MENU_VOLUME_INC:
|
||||
this->audio_data->change_audio_volume(true);
|
||||
break;
|
||||
case AUDIO_MENU_MUTE:
|
||||
this->audio_data->change_audio_mute();
|
||||
break;
|
||||
case AUDIO_MENU_RESTART:
|
||||
this->audio_data->request_audio_restart();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
this->audio_menu->reset_output_option();
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
case VIDEO_MENU_TYPE:
|
||||
if(this->video_menu->poll(event_data)) {
|
||||
switch(this->video_menu->selected_index) {
|
||||
|
|
@ -879,33 +906,6 @@ void WindowScreen::poll() {
|
|||
continue;
|
||||
}
|
||||
break;
|
||||
case AUDIO_MENU_TYPE:
|
||||
if(this->audio_menu->poll(event_data)) {
|
||||
switch(this->audio_menu->selected_index) {
|
||||
case AUDIO_MENU_BACK:
|
||||
this->setup_main_menu();
|
||||
return;
|
||||
case AUDIO_MENU_NO_ACTION:
|
||||
break;
|
||||
case AUDIO_MENU_VOLUME_DEC:
|
||||
this->audio_data->change_audio_volume(false);
|
||||
break;
|
||||
case AUDIO_MENU_VOLUME_INC:
|
||||
this->audio_data->change_audio_volume(true);
|
||||
break;
|
||||
case AUDIO_MENU_MUTE:
|
||||
this->audio_data->change_audio_mute();
|
||||
break;
|
||||
case AUDIO_MENU_RESTART:
|
||||
this->audio_data->request_audio_restart();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
this->audio_menu->reset_output_option();
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user