mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 09:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Onscreen Notifications and Overlays Sublabels

Browse Source
This commit is contained in:
Alfredo Monclus 2018-08-04 00:00:49 -03:00 committed by alfrix
parent 8fe519365c
commit ce20a9acdf
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intl/msg_hash_us.h
View File

@ -1235,8 +1235,12 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_ONSCREEN_DISPLAY_SETTINGS,
"Onscreen Display") "Onscreen Display")
MSG_HASH(MENU_ENUM_LABEL_VALUE_ONSCREEN_OVERLAY_SETTINGS, MSG_HASH(MENU_ENUM_LABEL_VALUE_ONSCREEN_OVERLAY_SETTINGS,
"Onscreen Overlay") "Onscreen Overlay")
MSG_HASH(MENU_ENUM_SUBLABEL_ONSCREEN_OVERLAY_SETTINGS,
"Adjust Bezels and Onscreen controls")
MSG_HASH(MENU_ENUM_LABEL_VALUE_ONSCREEN_NOTIFICATIONS_SETTINGS, MSG_HASH(MENU_ENUM_LABEL_VALUE_ONSCREEN_NOTIFICATIONS_SETTINGS,
"Onscreen Notifications") "Onscreen Notifications")
MSG_HASH(MENU_ENUM_SUBLABEL_ONSCREEN_NOTIFICATIONS_SETTINGS,
"Adjust the Onscreen Notifications")
MSG_HASH(MENU_ENUM_LABEL_VALUE_OPEN_ARCHIVE, MSG_HASH(MENU_ENUM_LABEL_VALUE_OPEN_ARCHIVE,
"Browse Archive") "Browse Archive")
MSG_HASH(MENU_ENUM_LABEL_VALUE_OPTIONAL, MSG_HASH(MENU_ENUM_LABEL_VALUE_OPTIONAL,

25
menu/cbs/menu_cbs_sublabel.c
View File

@ -457,6 +457,9 @@ default_sublabel_macro(action_bind_sublabel_resume_hardcode_mode,
default_sublabel_macro(action_bind_sublabel_midi_input, MENU_ENUM_SUBLABEL_MIDI_INPUT) default_sublabel_macro(action_bind_sublabel_midi_input, MENU_ENUM_SUBLABEL_MIDI_INPUT)
default_sublabel_macro(action_bind_sublabel_midi_output, MENU_ENUM_SUBLABEL_MIDI_OUTPUT) default_sublabel_macro(action_bind_sublabel_midi_output, MENU_ENUM_SUBLABEL_MIDI_OUTPUT)
default_sublabel_macro(action_bind_sublabel_midi_volume, MENU_ENUM_SUBLABEL_MIDI_VOLUME) default_sublabel_macro(action_bind_sublabel_midi_volume, MENU_ENUM_SUBLABEL_MIDI_VOLUME)
default_sublabel_macro(action_bind_sublabel_onscreen_overlay_settings_list, MENU_ENUM_SUBLABEL_ONSCREEN_OVERLAY_SETTINGS)
default_sublabel_macro(action_bind_sublabel_onscreen_notifications_settings_list, MENU_ENUM_SUBLABEL_ONSCREEN_NOTIFICATIONS_SETTINGS)
static int action_bind_sublabel_cheevos_entry( static int action_bind_sublabel_cheevos_entry(
file_list_t *list, file_list_t *list,
@ -505,9 +508,9 @@ static int action_bind_sublabel_remap_kbd_sublabel(
unsigned user_idx = (type - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN) / RARCH_FIRST_CUSTOM_BIND; unsigned user_idx = (type - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN) / RARCH_FIRST_CUSTOM_BIND;
snprintf(s, len, "User #%d: %s", user_idx + 1, snprintf(s, len, "User #%d: %s", user_idx + 1,
input_config_get_device_display_name(user_idx) ? input_config_get_device_display_name(user_idx) ?
input_config_get_device_display_name(user_idx) : input_config_get_device_display_name(user_idx) :
(input_config_get_device_name(user_idx) ? (input_config_get_device_name(user_idx) ?
input_config_get_device_name(user_idx) : "N/A")); input_config_get_device_name(user_idx) : "N/A"));
return 0; return 0;
} }
@ -544,7 +547,7 @@ static int action_bind_sublabel_audio_mixer_stream(
break; break;
} }
snprintf(s, len, "State : %s | Volume: %.2f dB", msg, snprintf(s, len, "State : %s | Volume: %.2f dB", msg,
stream->volume); stream->volume);
return 0; return 0;
} }
@ -555,13 +558,13 @@ static int action_bind_sublabel_remap_sublabel(
const char *label, const char *path, const char *label, const char *path,
char *s, size_t len) char *s, size_t len)
{ {
unsigned offset = (type - MENU_SETTINGS_INPUT_DESC_BEGIN) unsigned offset = (type - MENU_SETTINGS_INPUT_DESC_BEGIN)
/ (RARCH_FIRST_CUSTOM_BIND + 8); / (RARCH_FIRST_CUSTOM_BIND + 8);
snprintf(s, len, "User #%d: %s", offset + 1, snprintf(s, len, "User #%d: %s", offset + 1,
input_config_get_device_display_name(offset) ? input_config_get_device_display_name(offset) ?
input_config_get_device_display_name(offset) : input_config_get_device_display_name(offset) :
(input_config_get_device_name(offset) ? (input_config_get_device_name(offset) ?
input_config_get_device_name(offset) : "N/A")); input_config_get_device_name(offset) : "N/A"));
return 0; return 0;
} }
@ -1928,6 +1931,12 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_MIDI_VOLUME: case MENU_ENUM_LABEL_MIDI_VOLUME:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_midi_volume); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_midi_volume);
break; break;
case MENU_ENUM_LABEL_ONSCREEN_OVERLAY_SETTINGS:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_onscreen_overlay_settings_list);
break;
case MENU_ENUM_LABEL_ONSCREEN_NOTIFICATIONS_SETTINGS:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_onscreen_notifications_settings_list);
break;
default: default:
case MSG_UNKNOWN: case MSG_UNKNOWN:
return -1; return -1;