Skip to content

Commit bd43b6e

Browse files
libretroadminLibretroAdmin
libretroadmin
authored and
LibretroAdmin
committed
settings: migrate the menu throttle setting to a single-source def file
Second level-variant row: the throttle label owns its name while the display value references its value token; no sublabel, so the strings region anchors at the file tail. Performed by tools/settings_migrate_group.py with the standard battery.
1 parent 45ad7c9 commit bd43b6e

8 files changed

Lines changed: 472 additions & 10 deletions

File tree

‎configuration.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1820,7 +1820,6 @@ static struct config_bool_setting *populate_settings_bool(
18201820
SETTING_BOOL("video_filter_enable", &settings->bools.video_filter_enable, true, true, false);
18211821
SETTING_BOOL("apply_cheats_after_toggle", &settings->bools.apply_cheats_after_toggle, true, DEFAULT_APPLY_CHEATS_AFTER_TOGGLE, false);
18221822
SETTING_BOOL("apply_cheats_after_load", &settings->bools.apply_cheats_after_load, true, DEFAULT_APPLY_CHEATS_AFTER_LOAD, false);
1823-
SETTING_BOOL("menu_throttle_framerate", &settings->bools.menu_throttle_framerate, true, true, false);
18241823
SETTING_BOOL("run_ahead_enabled", &settings->bools.run_ahead_enabled, true, false, false);
18251824
SETTING_BOOL("run_ahead_secondary_instance", &settings->bools.run_ahead_secondary_instance, true, DEFAULT_RUN_AHEAD_SECONDARY_INSTANCE, false);
18261825
SETTING_BOOL("preemptive_frames_enable", &settings->bools.preemptive_frames_enable, true, false, false);
@@ -1931,6 +1930,7 @@ static struct config_bool_setting *populate_settings_bool(
19311930
#include "settings/settings_def_video_fullscreen.h"
19321931
#define SETTINGS_DEF_CONFIG_PASS
19331932
#include "settings/settings_def_video_sync.h"
1933+
#include "settings/settings_def_menu_throttle.h"
19341934
#include "settings/settings_def_video_ctx_scaling.h"
19351935
#include "settings/settings_def_input_sensors_extra.h"
19361936
#ifdef HAVE_NETWORKING
@@ -2609,6 +2609,7 @@ static struct config_float_setting *populate_settings_float(
26092609
#include "settings/settings_def_video_fullscreen.h"
26102610
#define SETTINGS_DEF_CONFIG_PASS
26112611
#include "settings/settings_def_video_sync.h"
2612+
#include "settings/settings_def_menu_throttle.h"
26122613
#include "settings/settings_def_video_ctx_scaling.h"
26132614
#include "settings/settings_def_input_sensors_extra.h"
26142615
#ifdef HAVE_NETWORKING
@@ -3245,6 +3246,7 @@ static struct config_uint_setting *populate_settings_uint(
32453246
#include "settings/settings_def_video_fullscreen.h"
32463247
#define SETTINGS_DEF_CONFIG_PASS
32473248
#include "settings/settings_def_video_sync.h"
3249+
#include "settings/settings_def_menu_throttle.h"
32483250
#include "settings/settings_def_video_ctx_scaling.h"
32493251
#include "settings/settings_def_input_sensors_extra.h"
32503252
#ifdef HAVE_NETWORKING
@@ -3914,6 +3916,7 @@ static struct config_int_setting *populate_settings_int(
39143916
#include "settings/settings_def_video_fullscreen.h"
39153917
#define SETTINGS_DEF_CONFIG_PASS
39163918
#include "settings/settings_def_video_sync.h"
3919+
#include "settings/settings_def_menu_throttle.h"
39173920
#include "settings/settings_def_video_ctx_scaling.h"
39183921
#include "settings/settings_def_input_sensors_extra.h"
39193922
#ifdef HAVE_NETWORKING
@@ -4471,6 +4474,7 @@ static struct config_int_setting *populate_settings_int(
44714474
#include "settings/settings_def_video_fullscreen.h"
44724475
#define SETTINGS_DEF_CONFIG_PASS
44734476
#include "settings/settings_def_video_sync.h"
4477+
#include "settings/settings_def_menu_throttle.h"
44744478
#include "settings/settings_def_video_ctx_scaling.h"
44754479
#include "settings/settings_def_input_sensors_extra.h"
44764480
#ifdef HAVE_NETWORKING

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2206,10 +2206,6 @@ MSG_HASH(
22062206
MENU_ENUM_LABEL_REWIND_BUFFER_SIZE,
22072207
MENU_ENUM_LABEL_REWIND_BUFFER_SIZE_STR
22082208
)
2209-
MSG_HASH(
2210-
MENU_ENUM_LABEL_MENU_THROTTLE_FRAMERATE,
2211-
MENU_ENUM_LABEL_MENU_THROTTLE_FRAMERATE_STR
2212-
)
22132209
MSG_HASH(
22142210
MENU_ENUM_LABEL_MENU_ENUM_THROTTLE_FRAMERATE,
22152211
MENU_ENUM_LABEL_MENU_ENUM_THROTTLE_FRAMERATE_STR

‎intl/msg_hash_us.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,7 @@ static const char *const msg_hash_us_lbl_strs[] = {
567567
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) n,
568568
#include "../settings/settings_def_video_fullscreen.h"
569569
#include "../settings/settings_def_video_sync.h"
570+
#include "../settings/settings_def_menu_throttle.h"
570571
#include "../settings/settings_def_video_ctx_scaling.h"
571572
#include "../settings/settings_def_input_sensors_extra.h"
572573
#include "../settings/settings_def_netplay_advanced.h"
@@ -913,6 +914,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
913914
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
914915
#include "../settings/settings_def_video_fullscreen.h"
915916
#include "../settings/settings_def_video_sync.h"
917+
#include "../settings/settings_def_menu_throttle.h"
916918
#include "../settings/settings_def_video_ctx_scaling.h"
917919
#include "../settings/settings_def_input_sensors_extra.h"
918920
#include "../settings/settings_def_netplay_advanced.h"

‎intl/msg_hash_us.h‎

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34150,3 +34150,170 @@ MSG_HASH(
3415034150
"SMB Share"
3415134151
)
3415234152
#endif
34153+
/* GENERATED REGION: menu throttle setting (see settings_def_menu_throttle.h). */
34154+
#define SETTINGS_DEF_STRINGS_PASS
34155+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
34156+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34157+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34158+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
34159+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34160+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
34161+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34162+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34163+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
34164+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34165+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
34166+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34167+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34168+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
34169+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34170+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
34171+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34172+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34173+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
34174+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34175+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
34176+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34177+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34178+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
34179+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34180+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
34181+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34182+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34183+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
34184+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34185+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
34186+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34187+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34188+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
34189+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34190+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
34191+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34192+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34193+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
34194+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34195+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
34196+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34197+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34198+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
34199+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34200+
#define S_ACTION(T, n, us, sub) \
34201+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34202+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34203+
#define S_ACTION_NS(T, n, us) \
34204+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34205+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
34206+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34207+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34208+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
34209+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34210+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
34211+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34212+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34213+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
34214+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34215+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
34216+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34217+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34218+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
34219+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34220+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
34221+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34222+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34223+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
34224+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34225+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
34226+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34227+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34228+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
34229+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34230+
#define S_BOOL_LV(f, T, TV, n, d, sd, df, c, us, sub) \
34231+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34232+
#define S_BOOL_LV_NS(f, T, TV, n, d, sd, df, c, us)
34233+
#define S_FLOAT_LV(f, T, TV, n, d, rnd, sd, df, c, us, sub) \
34234+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34235+
#define S_FLOAT_LV_NS(f, T, TV, n, d, rnd, sd, df, c, us)
34236+
#define S_STRING_LV(f, T, TV, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
34237+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34238+
#define S_STRING_LV_NS(f, T, TV, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us)
34239+
#define S_ACTION_LV(T, TV, n, sd, ok, rp, c, us, sub) \
34240+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34241+
#define S_ACTION_LV_NS(T, TV, n, sd, ok, rp, c, us)
34242+
#include "../settings/settings_def_menu_throttle.h"
34243+
#undef S_BOOL
34244+
#undef S_BOOL_NS
34245+
#undef S_BOOL_H
34246+
#undef S_BOOL_NS_H
34247+
#undef S_UINT
34248+
#undef S_UINT_NS
34249+
#undef S_UINT_H
34250+
#undef S_UINT_NS_H
34251+
#undef S_INT
34252+
#undef S_INT_NS
34253+
#undef S_INT_H
34254+
#undef S_INT_NS_H
34255+
#undef S_FLOAT
34256+
#undef S_FLOAT_NS
34257+
#undef S_FLOAT_H
34258+
#undef S_FLOAT_NS_H
34259+
#undef S_STRING
34260+
#undef S_STRING_NS
34261+
#undef S_STRING_H
34262+
#undef S_STRING_NS_H
34263+
#undef S_DIR
34264+
#undef S_DIR_NS
34265+
#undef S_DIR_H
34266+
#undef S_DIR_NS_H
34267+
#undef S_STRING_P
34268+
#undef S_STRING_P_NS
34269+
#undef S_STRING_P_H
34270+
#undef S_STRING_P_NS_H
34271+
#undef S_PATH
34272+
#undef S_PATH_NS
34273+
#undef S_PATH_H
34274+
#undef S_PATH_NS_H
34275+
#undef S_PATH_DS
34276+
#undef S_PATH_DS_NS
34277+
#undef S_PATH_DS_H
34278+
#undef S_PATH_DS_NS_H
34279+
#undef S_ACTION
34280+
#undef S_ACTION_NS
34281+
#undef S_ACTION_H
34282+
#undef S_ACTION_NS_H
34283+
#undef S_BOOL_EX
34284+
#undef S_BOOL_EX_NS
34285+
#undef S_BOOL_EX_H
34286+
#undef S_BOOL_EX_NS_H
34287+
#undef S_UINT_EX
34288+
#undef S_UINT_EX_NS
34289+
#undef S_UINT_EX_H
34290+
#undef S_UINT_EX_NS_H
34291+
#undef S_INT_EX
34292+
#undef S_INT_EX_NS
34293+
#undef S_INT_EX_H
34294+
#undef S_INT_EX_NS_H
34295+
#undef S_FLOAT_EX
34296+
#undef S_FLOAT_EX_NS
34297+
#undef S_FLOAT_EX_H
34298+
#undef S_FLOAT_EX_NS_H
34299+
#undef S_ACTION_EX
34300+
#undef S_ACTION_EX_NS
34301+
#undef S_ACTION_EX_H
34302+
#undef S_ACTION_EX_NS_H
34303+
#undef S_BOOL_LV
34304+
#undef S_BOOL_LV_NS
34305+
#undef S_BOOL_LV_H
34306+
#undef S_BOOL_LV_NS_H
34307+
#undef S_FLOAT_LV
34308+
#undef S_FLOAT_LV_NS
34309+
#undef S_FLOAT_LV_H
34310+
#undef S_FLOAT_LV_NS_H
34311+
#undef S_STRING_LV
34312+
#undef S_STRING_LV_NS
34313+
#undef S_STRING_LV_H
34314+
#undef S_STRING_LV_NS_H
34315+
#undef S_ACTION_LV
34316+
#undef S_ACTION_LV_NS
34317+
#undef S_ACTION_LV_H
34318+
#undef S_ACTION_LV_NS_H
34319+
#undef SETTINGS_DEF_STRINGS_PASS

0 commit comments

Comments
 (0)