From 4120abd4d42a0148967fb90b9b4b8eb444c5c2b6 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 27 Jul 2020 06:27:35 +0200 Subject: [PATCH] Cleanups --- intl/msg_hash_lbl.h | 24 ++++++++++++++++++++++++ msg_hash.h | 31 +++++++++---------------------- 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index b965644419..91107f61f9 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -4654,3 +4654,27 @@ MSG_HASH( MENU_ENUM_LABEL_SETTINGS_VIEWS_SETTINGS, "settings_views_settings" ) +MSG_HASH( + MENU_ENUM_LABEL_MIXER_ACTION_PLAY, + "mixer_action_play" + ) +MSG_HASH( + MENU_ENUM_LABEL_MIXER_ACTION_PLAY_LOOPED, + "mixer_action_play_looped" + ) +MSG_HASH( + MENU_ENUM_LABEL_MIXER_ACTION_PLAY_SEQUENTIAL, + "mixer_action_play_sequential" + ) +MSG_HASH( + MENU_ENUM_LABEL_MIXER_ACTION_STOP, + "mixer_action_stop" + ) +MSG_HASH( + MENU_ENUM_LABEL_MIXER_ACTION_REMOVE, + "mixer_action_remove" + ) +MSG_HASH( + MENU_ENUM_LABEL_MIXER_ACTION_VOLUME, + "mixer_action_volume" + ) diff --git a/msg_hash.h b/msg_hash.h index 29cbd9ec81..4ef2ee8de1 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -511,12 +511,6 @@ enum msg_hash_enums MENU_ENUM_LABEL_DISCORD_STATUS_PAUSED, MENU_ENUM_LABEL_VALUE_DISCORD_STATUS_PAUSED, - MENU_ENUM_LABEL_VALUE_MIXER_ACTION_PLAY, - MENU_ENUM_LABEL_VALUE_MIXER_ACTION_PLAY_LOOPED, - MENU_ENUM_LABEL_VALUE_MIXER_ACTION_PLAY_SEQUENTIAL, - MENU_ENUM_LABEL_VALUE_MIXER_ACTION_STOP, - MENU_ENUM_LABEL_VALUE_MIXER_ACTION_REMOVE, - MENU_ENUM_LABEL_VALUE_MIXER_ACTION_VOLUME, MENU_ENUM_LABEL_VALUE_REMAP_FILE, MENU_ENUM_LABEL_VALUE_CHEAT_FILE, @@ -2556,12 +2550,12 @@ enum msg_hash_enums MENU_ENUM_LABEL_CB_SINGLE_THUMBNAIL, /* Sublabels */ - MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY, - MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_LOOPED, - MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_SEQUENTIAL, - MENU_ENUM_SUBLABEL_MIXER_ACTION_STOP, - MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE, - MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME, + MENU_LABEL(MIXER_ACTION_PLAY), + MENU_LABEL(MIXER_ACTION_PLAY_LOOPED), + MENU_LABEL(MIXER_ACTION_PLAY_SEQUENTIAL), + MENU_LABEL(MIXER_ACTION_STOP), + MENU_LABEL(MIXER_ACTION_REMOVE), + MENU_LABEL(MIXER_ACTION_VOLUME), MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST, #ifdef HAVE_LAKKA MENU_ENUM_SUBLABEL_SERVICES_SETTINGS, @@ -2847,16 +2841,9 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_TIMEDATE_HMS_AMPM, MENU_ENUM_LABEL_VALUE_TIMEDATE_HM_AMPM, - MENU_ENUM_LABEL_SWITCH_GPU_PROFILE, - MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE, - MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE, - - MENU_ENUM_LABEL_SWITCH_BACKLIGHT_CONTROL, - MENU_ENUM_LABEL_VALUE_SWITCH_BACKLIGHT_CONTROL, - MENU_ENUM_SUBLABEL_SWITCH_BACKLIGHT_CONTROL, - MENU_ENUM_LABEL_SWITCH_CPU_PROFILE, - MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE, - MENU_ENUM_SUBLABEL_SWITCH_CPU_PROFILE, + MENU_LABEL(SWITCH_GPU_PROFILE), + MENU_LABEL(SWITCH_BACKLIGHT_CONTROL), + MENU_LABEL(SWITCH_CPU_PROFILE), MENU_ENUM_LABEL_VALUE_HOLD_START, MENU_ENUM_LABEL_VALUE_HOLD_SELECT,