diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 50085a6d82..3020f66c27 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -1495,7 +1495,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_MONITOR_INDEX, MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_POST_FILTER_RECORD, "Use Post Filter Recording") MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE, - "Refresh Rate") + "Vertical Refresh Rate") MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE_AUTO, "Estimated Monitor Framerate") MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_ROTATION, @@ -2146,3 +2146,15 @@ MSG_HASH( MENU_ENUM_SUBLABEL_DUMMY_ON_CORE_SHUTDOWN, "Some cores might have a shutdown feature. If enabled, it will prevent the core from shutting RetroArch down. Instead, it loads a dummy core." ) +MSG_HASH( + MENU_ENUM_SUBLABEL_VIDEO_REFRESH_RATE, + "Vertical refresh rate of your monitor. Used to calculate a suitable audio input rate. NOTE: This will be ignored if 'Threaded Video' is enabled." + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_AUDIO_ENABLE, + "Enable audio output." + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_AUDIO_MAX_TIMING_SKEW, + "The maximum change in audio input rate. You may want to increase this to enable very large changes in timing, for example running PAL cores on NTSC displays, at the cost of inaccurate audio pitch." + ) diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 98573035c3..f473b081ca 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -100,6 +100,9 @@ default_sublabel_macro(action_bind_sublabel_input_duty_cycle, MENU_ default_sublabel_macro(action_bind_sublabel_video_vertical_sync, MENU_ENUM_SUBLABEL_VIDEO_VSYNC) default_sublabel_macro(action_bind_sublabel_core_allow_rotate, MENU_ENUM_SUBLABEL_VIDEO_ALLOW_ROTATE) default_sublabel_macro(action_bind_sublabel_dummy_on_core_shutdown, MENU_ENUM_SUBLABEL_DUMMY_ON_CORE_SHUTDOWN) +default_sublabel_macro(action_bind_sublabel_video_refresh_rate, MENU_ENUM_SUBLABEL_VIDEO_REFRESH_RATE) +default_sublabel_macro(action_bind_sublabel_audio_enable, MENU_ENUM_SUBLABEL_AUDIO_ENABLE) +default_sublabel_macro(action_bind_sublabel_audio_max_timing_skew, MENU_ENUM_SUBLABEL_AUDIO_MAX_TIMING_SKEW) static int action_bind_sublabel_cheevos_entry( file_list_t *list, @@ -141,6 +144,15 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, { switch (cbs->enum_idx) { + case MENU_ENUM_LABEL_AUDIO_MAX_TIMING_SKEW: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_audio_max_timing_skew); + break; + case MENU_ENUM_LABEL_AUDIO_ENABLE: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_audio_enable); + break; + case MENU_ENUM_LABEL_VIDEO_REFRESH_RATE: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_refresh_rate); + break; case MENU_ENUM_LABEL_DUMMY_ON_CORE_SHUTDOWN: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_dummy_on_core_shutdown); break; diff --git a/msg_hash.h b/msg_hash.h index df031f9bf1..032384b5e9 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -693,8 +693,9 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_VIDEO_CROP_OVERSCAN, MENU_ENUM_LABEL_VALUE_VIDEO_SCALE_INTEGER, - MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE, MENU_ENUM_LABEL_VIDEO_REFRESH_RATE, + MENU_ENUM_SUBLABEL_VIDEO_REFRESH_RATE, + MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE, MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE_AUTO, MENU_ENUM_LABEL_VIDEO_REFRESH_RATE_AUTO, @@ -1180,22 +1181,28 @@ enum msg_hash_enums /* Audio */ MENU_ENUM_LABEL_AUDIO_ENABLE, + MENU_ENUM_SUBLABEL_AUDIO_ENABLE, + MENU_ENUM_LABEL_VALUE_AUDIO_ENABLE, + MENU_ENUM_LABEL_AUDIO_MAX_TIMING_SKEW, - MENU_ENUM_LABEL_AUDIO_DEVICE, - MENU_ENUM_LABEL_AUDIO_BLOCK_FRAMES, + MENU_ENUM_SUBLABEL_AUDIO_MAX_TIMING_SKEW, + MENU_ENUM_LABEL_VALUE_AUDIO_MAX_TIMING_SKEW, + MENU_ENUM_LABEL_AUDIO_OUTPUT_RATE, + MENU_ENUM_LABEL_VALUE_AUDIO_OUTPUT_RATE, + + MENU_ENUM_LABEL_AUDIO_DEVICE, + MENU_ENUM_LABEL_VALUE_AUDIO_DEVICE, + + MENU_ENUM_LABEL_AUDIO_BLOCK_FRAMES, + MENU_ENUM_LABEL_VALUE_AUDIO_BLOCK_FRAMES, + MENU_ENUM_LABEL_AUDIO_DSP_PLUGIN, + MENU_ENUM_LABEL_VALUE_AUDIO_DSP_PLUGIN, MENU_ENUM_LABEL_AUDIO_MUTE, - MENU_ENUM_LABEL_VALUE_AUDIO_MUTE, MENU_ENUM_SUBLABEL_AUDIO_MUTE, - - MENU_ENUM_LABEL_VALUE_AUDIO_OUTPUT_RATE, - MENU_ENUM_LABEL_VALUE_AUDIO_DSP_PLUGIN, - MENU_ENUM_LABEL_VALUE_AUDIO_BLOCK_FRAMES, - MENU_ENUM_LABEL_VALUE_AUDIO_ENABLE, - MENU_ENUM_LABEL_VALUE_AUDIO_MAX_TIMING_SKEW, - MENU_ENUM_LABEL_VALUE_AUDIO_DEVICE, + MENU_ENUM_LABEL_VALUE_AUDIO_MUTE, MENU_ENUM_LABEL_AUDIO_SYNC, MENU_ENUM_SUBLABEL_AUDIO_SYNC,