diff --git a/config.def.h b/config.def.h index da290b1c1b..2aa743544a 100644 --- a/config.def.h +++ b/config.def.h @@ -67,8 +67,8 @@ static bool bundle_assets_extract_enable = false; static bool materialui_icons_enable = true; #endif -static const bool CRT_Switch_Resolution = false; //ben -static const int CRT_Switch_Resolution_super = 2560; +static const bool crt_switch_resolution = false; +static const int crt_switch_resolution_super = 2560; static const bool def_history_list_enable = true; diff --git a/configuration.c b/configuration.c index a95e8708a8..5f4c717609 100644 --- a/configuration.c +++ b/configuration.c @@ -1242,7 +1242,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings, SETTING_BOOL("video_vsync", &settings->bools.video_vsync, true, vsync, false); SETTING_BOOL("video_hard_sync", &settings->bools.video_hard_sync, true, hard_sync, false); SETTING_BOOL("video_black_frame_insertion", &settings->bools.video_black_frame_insertion, true, black_frame_insertion, false); - SETTING_BOOL("CRT_Switch_Resolution", &settings->bools.CRT_Switch_Resolution, true, CRT_Switch_Resolution, false); //ben + SETTING_BOOL("crt_switch_resolution", &settings->bools.crt_switch_resolution, true, crt_switch_resolution, false); //ben SETTING_BOOL("video_disable_composition", &settings->bools.video_disable_composition, true, disable_composition, false); SETTING_BOOL("pause_nonactive", &settings->bools.pause_nonactive, true, pause_nonactive, false); SETTING_BOOL("video_gpu_screenshot", &settings->bools.video_gpu_screenshot, true, gpu_screenshot, false); @@ -1486,7 +1486,7 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings, #endif SETTING_UINT("audio_out_rate", &settings->uints.audio_out_rate, true, out_rate, false); SETTING_UINT("custom_viewport_width", &settings->video_viewport_custom.width, false, 0 /* TODO */, false); - SETTING_UINT("CRT_Switch_Resolution_super", &settings->uints.CRT_Switch_Resolution_super, true, CRT_Switch_Resolution_super, false);//ben + SETTING_UINT("crt_switch_resolution_super", &settings->uints.crt_switch_resolution_super, true, crt_switch_resolution_super, false); SETTING_UINT("custom_viewport_height", &settings->video_viewport_custom.height, false, 0 /* TODO */, false); SETTING_UINT("custom_viewport_x", (unsigned*)&settings->video_viewport_custom.x, false, 0 /* TODO */, false); SETTING_UINT("custom_viewport_y", (unsigned*)&settings->video_viewport_custom.y, false, 0 /* TODO */, false); diff --git a/configuration.h b/configuration.h index a0009eae00..559aa75ab2 100644 --- a/configuration.h +++ b/configuration.h @@ -95,7 +95,7 @@ typedef struct settings bool video_statistics_show; bool video_framecount_show; bool video_msg_bgcolor_enable; - bool CRT_Switch_Resolution; //ben + bool crt_switch_resolution; //ben /* Audio */ bool audio_enable; @@ -334,7 +334,7 @@ typedef struct settings unsigned video_window_x; unsigned video_window_y; unsigned video_window_opacity; - unsigned CRT_Switch_Resolution_super; //ben + unsigned crt_switch_resolution_super; //ben unsigned video_monitor_index; unsigned video_fullscreen_x; unsigned video_fullscreen_y; diff --git a/msg_hash.h b/msg_hash.h index 18e5f6ab9f..1a1c5e07df 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -665,7 +665,7 @@ enum msg_hash_enums MENU_LABEL(INPUT_UNIFIED_MENU_CONTROLS), /* Video */ - MENU_LABEL(CRT_SWITCH_RESOLUTION), //ben + MENU_LABEL(CRT_SWITCH_RESOLUTION), MENU_LABEL(CRT_SWITCH_RESOLUTION_SUPER), MENU_LABEL(VIDEO_FONT_ENABLE), MENU_LABEL(VIDEO_FONT_PATH),