settings: migrate the third main menu action group to a single-source def file

Performed by tools/settings_migrate_group.py with the standard
battery including the platform-profile lanes and the integrated
enum consolidation stage.

Author: libretroadmin

configuration.c

@@ -1966,6 +1966,7 @@ static struct config_bool_setting *populate_settings_bool(
 #include "settings/settings_def_video_fullscreen.h"
 #define SETTINGS_DEF_CONFIG_PASS
 #include "settings/settings_def_video_sync.h"
+#include "settings/settings_def_menu_main_actions_3.h"
 #include "settings/settings_def_menu_main_actions_1.h"
 #include "settings/settings_def_user_identity.h"
 #include "settings/settings_def_netplay_passwords.h"
@@ -2442,6 +2443,7 @@ static struct config_float_setting *populate_settings_float(
 #include "settings/settings_def_video_fullscreen.h"
 #define SETTINGS_DEF_CONFIG_PASS
 #include "settings/settings_def_video_sync.h"
+#include "settings/settings_def_menu_main_actions_3.h"
 #include "settings/settings_def_menu_main_actions_1.h"
 #include "settings/settings_def_user_identity.h"
 #include "settings/settings_def_netplay_passwords.h"
@@ -2877,6 +2879,7 @@ static struct config_uint_setting *populate_settings_uint(
 #include "settings/settings_def_video_fullscreen.h"
 #define SETTINGS_DEF_CONFIG_PASS
 #include "settings/settings_def_video_sync.h"
+#include "settings/settings_def_menu_main_actions_3.h"
 #include "settings/settings_def_menu_main_actions_1.h"
 #include "settings/settings_def_user_identity.h"
 #include "settings/settings_def_netplay_passwords.h"
@@ -3288,6 +3291,7 @@ static struct config_int_setting *populate_settings_int(
 #include "settings/settings_def_video_fullscreen.h"
 #define SETTINGS_DEF_CONFIG_PASS
 #include "settings/settings_def_video_sync.h"
+#include "settings/settings_def_menu_main_actions_3.h"
 #include "settings/settings_def_menu_main_actions_1.h"
 #include "settings/settings_def_user_identity.h"
 #include "settings/settings_def_netplay_passwords.h"
@@ -3499,6 +3503,7 @@ static struct config_int_setting *populate_settings_int(
 #include "settings/settings_def_video_fullscreen.h"
 #define SETTINGS_DEF_CONFIG_PASS
 #include "settings/settings_def_video_sync.h"
+#include "settings/settings_def_menu_main_actions_3.h"
 #include "settings/settings_def_menu_main_actions_1.h"
 #include "settings/settings_def_user_identity.h"
 #include "settings/settings_def_netplay_passwords.h"

intl/msg_hash_lbl.h

@@ -2080,20 +2080,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY,
    MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY_STR
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_LOAD_DISC,
-   MENU_ENUM_LABEL_LOAD_DISC_STR
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_DUMP_DISC,
-   MENU_ENUM_LABEL_DUMP_DISC_STR
-   )
-#ifdef HAVE_LAKKA
-MSG_HASH(
-   MENU_ENUM_LABEL_EJECT_DISC,
-   MENU_ENUM_LABEL_EJECT_DISC_STR
-   )
-#endif
 MSG_HASH(
    MENU_ENUM_LABEL_LOAD_CONTENT_SPECIAL,
    MENU_ENUM_LABEL_LOAD_CONTENT_SPECIAL_STR

intl/msg_hash_us.c

@@ -549,6 +549,7 @@ static const char *const msg_hash_us_lbl_strs[] = {
 #define S_ACTION_NS(T, n, us) n,
 #include "../settings/settings_def_video_fullscreen.h"
 #include "../settings/settings_def_video_sync.h"
+#include "../settings/settings_def_menu_main_actions_3.h"
 #include "../settings/settings_def_menu_main_actions_1.h"
 #include "../settings/settings_def_user_identity.h"
 #include "../settings/settings_def_netplay_passwords.h"
@@ -687,6 +688,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
 #define S_ACTION_NS(T, n, us) (uint32_t)MENU_ENUM_LABEL_##T,
 #include "../settings/settings_def_video_fullscreen.h"
 #include "../settings/settings_def_video_sync.h"
+#include "../settings/settings_def_menu_main_actions_3.h"
 #include "../settings/settings_def_menu_main_actions_1.h"
 #include "../settings/settings_def_user_identity.h"
 #include "../settings/settings_def_netplay_passwords.h"

intl/msg_hash_us.h

@@ -175,32 +175,80 @@ MSG_HASH(
    MENU_ENUM_LABEL_HELP_LOAD_CONTENT_LIST,
    "Browse for content. To load content, you need a 'Core' to use, and a content file.\nTo control where the menu starts to browse for content, set 'File Browser Directory'. If not set, it will start in root.\nThe browser will filter out extensions for the last core set in 'Load Core', and use that core when content is loaded."
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_LOAD_DISC,
-   "Load Disc"
-   )
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_LOAD_DISC,
-   "Load a physical media disc. First select the core (Load Core) to use with the disc."
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_DUMP_DISC,
-   "Dump Disc"
-   )
-MSG_HASH( /* FIXME Is a specific image format used? Is it determined automatically? User choice? */
-   MENU_ENUM_SUBLABEL_DUMP_DISC,
-   "Dump the physical media disc to internal storage. It will be saved as an image file."
-   )
-#ifdef HAVE_LAKKA
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EJECT_DISC,
-   "Eject Disc"
-   )
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_EJECT_DISC,
-   "Ejects the disc from physical CD/DVD drive."
-   )
-#endif
+/* GENERATED REGION: third main menu action group (see settings_def_menu_main_actions_3.h). */
+#define SETTINGS_DEF_STRINGS_PASS
+#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
+MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
+#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
+#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
+MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
+#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
+#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
+MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
+#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
+#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
+MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
+#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
+#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
+MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
+#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
+#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
+MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
+#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
+#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
+MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
+#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
+#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
+MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
+#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
+#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
+MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
+#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
+#define S_ACTION(T, n, us, sub) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
+MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
+#define S_ACTION_NS(T, n, us) \
+MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
+#include "../settings/settings_def_menu_main_actions_3.h"
+#undef S_BOOL
+#undef S_BOOL_NS
+#undef S_UINT
+#undef S_UINT_NS
+#undef S_INT
+#undef S_INT_NS
+#undef S_FLOAT
+#undef S_FLOAT_NS
+#undef S_STRING
+#undef S_STRING_NS
+#undef S_DIR
+#undef S_DIR_NS
+#undef S_STRING_P
+#undef S_STRING_P_NS
+#undef S_PATH
+#undef S_PATH_NS
+#undef S_PATH_DS
+#undef S_PATH_DS_NS
+#undef S_ACTION
+#undef S_ACTION_NS
+#undef SETTINGS_DEF_STRINGS_PASS
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_PLAYLISTS_TAB,
    "Playlists"

menu/menu_setting.c

@@ -11188,11 +11188,68 @@ static bool setting_append_list(
                {
          {
             static const setting_desc_t mm_desc_4[] = {
-               SDESC_ACTION_ROW(LOAD_DISC),
-               SDESC_ACTION_ROW(DUMP_DISC),
-#ifdef HAVE_LAKKA
-               SDESC_ACTION_ROW(EJECT_DISC),
-#endif
+/* GENERATED: rows come from settings_def_menu_main_actions_3.h in order. */
+#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
+                  SDESC_BOOL_ROW(f, T, d, sd, df, c),
+#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
+                  SDESC_BOOL_ROW(f, T, d, sd, df, c),
+#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
+                  SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
+#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
+                  SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
+#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
+                  SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
+#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
+                  SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
+#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
+                  SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
+#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
+                  SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
+#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
+                  SDESC_STRING_ROW(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
+#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
+                  SDESC_STRING_ROW(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
+#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
+                  SDESC_DIR_ROW(f, T, d, el, sd, c, sta),
+#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
+                  SDESC_DIR_ROW(f, T, d, el, sd, c, sta),
+#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
+                  SDESC_STRING_ROW_P(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
+#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
+                  SDESC_STRING_ROW_P(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
+#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
+                  SDESC_PATH_ROW(f, T, d, sd, c, vals, rp, ui),
+#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
+                  SDESC_PATH_ROW(f, T, d, sd, c, vals, rp, ui),
+#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
+                  SDESC_PATH_ROW_DS(f, T, df2, sd, c, vals, rp, ui),
+#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
+                  SDESC_PATH_ROW_DS(f, T, df2, sd, c, vals, rp, ui),
+#define S_ACTION(T, n, us, sub) \
+                  SDESC_ACTION_ROW(T),
+#define S_ACTION_NS(T, n, us) \
+                  SDESC_ACTION_ROW(T),
+#include "../settings/settings_def_menu_main_actions_3.h"
+#undef S_BOOL
+#undef S_BOOL_NS
+#undef S_UINT
+#undef S_UINT_NS
+#undef S_INT
+#undef S_INT_NS
+#undef S_FLOAT
+#undef S_FLOAT_NS
+#undef S_STRING
+#undef S_STRING_NS
+#undef S_DIR
+#undef S_DIR_NS
+#undef S_STRING_P
+#undef S_STRING_P_NS
+#undef S_PATH
+#undef S_PATH_NS
+#undef S_PATH_DS
+#undef S_PATH_DS_NS
+#undef S_ACTION
+#undef S_ACTION_NS
             };
             settings_list_add_desc(list, list_info, settings,
                   mm_desc_4, ARRAY_SIZE(mm_desc_4),

msg_hash_lbl_str.h

@@ -524,9 +524,6 @@
 #define MENU_ENUM_LABEL_LOAD_ARCHIVE_STR "load_archive"
 #define MENU_ENUM_LABEL_LOAD_ARCHIVE_DETECT_CORE_STR "load_archive_detect_core"
 #define MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY_STR "load_recent"
-#define MENU_ENUM_LABEL_LOAD_DISC_STR "load_disc"
-#define MENU_ENUM_LABEL_DUMP_DISC_STR "dump_disc"
-#define MENU_ENUM_LABEL_EJECT_DISC_STR "eject_disc"
 #define MENU_ENUM_LABEL_LOAD_CONTENT_SPECIAL_STR "load_special"
 #define MENU_ENUM_LABEL_LOAD_CONTENT_LIST_STR "load_content"
 #define MENU_ENUM_LABEL_LOAD_STATE_STR "load_state"

settings/settings_def_menu_main_actions_3.h

@@ -0,0 +1,31 @@
+/* Single-source definitions: third main menu action group.
+ * Grammar identical to settings_def_video_sync.h plus S_FLOAT and
+ * the _NS no-sublabel variants; the descriptor argument span
+ * matches SDESC_<kind>_ROW; row order is menu display order;
+ * h2json.py parses these rows for the Crowdin source upload. */
+
+/* Descriptor and configuration rows are #ifdef HAVE_CDROM; the string
+ * tables always carry this row via the strings pass. */
+#if defined(HAVE_CDROM) || defined(SETTINGS_DEF_STRINGS_PASS)
+S_ACTION(LOAD_DISC,
+      "load_disc",
+      "Load Disc",
+      "Load a physical media disc. First select the core (Load Core) to use with the disc.")
+#endif
+/* Descriptor and configuration rows are #ifdef HAVE_CDROM; the string
+ * tables always carry this row via the strings pass. */
+#if defined(HAVE_CDROM) || defined(SETTINGS_DEF_STRINGS_PASS)
+/* FIXME Is a specific image format used? Is it determined automatically? User choice? */
+S_ACTION(DUMP_DISC,
+      "dump_disc",
+      "Dump Disc",
+      "Dump the physical media disc to internal storage. It will be saved as an image file.")
+#endif
+#ifdef HAVE_CDROM
+#ifdef HAVE_LAKKA
+S_ACTION(EJECT_DISC,
+      "eject_disc",
+      "Eject Disc",
+      "Ejects the disc from physical CD/DVD drive.")
+#endif
+#endif