Start adding Disc Information

This commit is contained in:
twinaphex 2019-07-11 05:45:31 +02:00
parent 6abca4c323
commit 25e4af4a24
25 changed files with 180 additions and 6 deletions

View File

@ -3774,3 +3774,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_MOVE_UP_DOWN,
"Animation Move Up/Down")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
"Animation Main Menu Opens/Closes")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISC_INFORMATION,
"Disc Information"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISC_INFORMATION,
"View information about inserted media discs."
)

View File

@ -4792,3 +4792,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_MOVE_UP_DOWN,
"Animation Move Up/Down")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
"Animation Main Menu Opens/Closes")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISC_INFORMATION,
"Disc Information"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISC_INFORMATION,
"View information about inserted media discs."
)

View File

@ -3550,3 +3550,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_MOVE_UP_DOWN,
"Animation Move Up/Down")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
"Animation Main Menu Opens/Closes")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISC_INFORMATION,
"Disc Information"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISC_INFORMATION,
"View information about inserted media discs."
)

View File

@ -3679,3 +3679,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_MOVE_UP_DOWN,
"Animation Move Up/Down")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
"Animation Main Menu Opens/Closes")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISC_INFORMATION,
"Disc Information"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISC_INFORMATION,
"View information about inserted media discs."
)

View File

@ -7756,3 +7756,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_MOVE_UP_DOWN,
"Animation Move Up/Down")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
"Animation Main Menu Opens/Closes")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISC_INFORMATION,
"Disc Information"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISC_INFORMATION,
"View information about inserted media discs."
)

View File

@ -3438,3 +3438,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_MOVE_UP_DOWN,
"Animation Move Up/Down")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
"Animation Main Menu Opens/Closes")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISC_INFORMATION,
"Disc Information"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISC_INFORMATION,
"View information about inserted media discs."
)

View File

@ -7908,3 +7908,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_MOVE_UP_DOWN,
"Animation Move Up/Down")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
"Animation Main Menu Opens/Closes")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISC_INFORMATION,
"Disc Information"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISC_INFORMATION,
"View information about inserted media discs."
)

View File

@ -8696,3 +8696,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_MOVE_UP_DOWN,
"Animation Move Up/Down")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
"Animation Main Menu Opens/Closes")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISC_INFORMATION,
"Disc Information"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISC_INFORMATION,
"View information about inserted media discs."
)

View File

@ -3663,3 +3663,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_MOVE_UP_DOWN,
"Animation Move Up/Down")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
"Animation Main Menu Opens/Closes")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISC_INFORMATION,
"Disc Information"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISC_INFORMATION,
"View information about inserted media discs."
)

View File

@ -9019,3 +9019,11 @@ MSG_HASH(MSG_DISC_DUMP_FAILED_TO_WRITE_TO_DISK,
"ディスクに書き込みに失敗しました。ダンプが中止されました。")
MSG_HASH(MSG_NO_DISC_INSERTED,
"ドライブにディスクが挿入されていません。")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISC_INFORMATION,
"Disc Information"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISC_INFORMATION,
"View information about inserted media discs."
)

View File

@ -8903,3 +8903,11 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
"메뉴 열기/닫기 애니메이션"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISC_INFORMATION,
"Disc Information"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISC_INFORMATION,
"View information about inserted media discs."
)

View File

@ -215,6 +215,8 @@ MSG_HASH(MENU_ENUM_LABEL_CORE_ENABLE,
"menu_core_enable")
MSG_HASH(MENU_ENUM_LABEL_CORE_INFORMATION,
"core_information")
MSG_HASH(MENU_ENUM_LABEL_DISC_INFORMATION,
"disc_information")
MSG_HASH(MENU_ENUM_LABEL_CORE_INFO_ENTRY,
"core_info_entry")
MSG_HASH(MENU_ENUM_LABEL_CORE_INPUT_REMAPPING_OPTIONS,

View File

@ -3432,3 +3432,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_MOVE_UP_DOWN,
"Animation Move Up/Down")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
"Animation Main Menu Opens/Closes")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISC_INFORMATION,
"Disc Information"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISC_INFORMATION,
"View information about inserted media discs."
)

View File

@ -3828,3 +3828,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_MOVE_UP_DOWN,
"Animacja Przesuń w górę/w dół")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
"Menu główne animacji Otwiera/Zamyka")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISC_INFORMATION,
"Disc Information"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISC_INFORMATION,
"View information about inserted media discs."
)

View File

@ -8767,3 +8767,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_MOVE_UP_DOWN,
"Animação Move Para Cima/Baixo")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
"Animação do Menu Principal Abre/Fecha")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISC_INFORMATION,
"Disc Information"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISC_INFORMATION,
"View information about inserted media discs."
)

View File

@ -3504,3 +3504,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_MOVE_UP_DOWN,
"Animation Move Up/Down")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
"Animation Main Menu Opens/Closes")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISC_INFORMATION,
"Disc Information"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISC_INFORMATION,
"View information about inserted media discs."
)

View File

@ -3702,3 +3702,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_MOVE_UP_DOWN,
"Animation Move Up/Down")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
"Animation Main Menu Opens/Closes")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISC_INFORMATION,
"Disc Information"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISC_INFORMATION,
"View information about inserted media discs."
)

View File

@ -8576,3 +8576,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_MOVE_UP_DOWN,
"Animation Move Up/Down")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
"Animation Main Menu Opens/Closes")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISC_INFORMATION,
"Disc Information"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISC_INFORMATION,
"View information about inserted media discs."
)

View File

@ -8951,3 +8951,11 @@ MSG_HASH(MSG_DISC_DUMP_FAILED_TO_WRITE_TO_DISK,
"Failed to write to disk. Dump aborted.")
MSG_HASH(MSG_NO_DISC_INSERTED,
"No disc is inserted in the drive.")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISC_INFORMATION,
"Disc Information"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISC_INFORMATION,
"View information about inserted media discs."
)

View File

@ -3594,3 +3594,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_MOVE_UP_DOWN,
"Animation Move Up/Down")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
"Animation Main Menu Opens/Closes")
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISC_INFORMATION,
"Disc Information"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_DISC_INFORMATION,
"View information about inserted media discs."
)

View File

@ -130,6 +130,7 @@ generic_deferred_push(deferred_push_video_font_path, DISPLAYLIST_
generic_deferred_push(deferred_push_xmb_font_path, DISPLAYLIST_FONTS)
generic_deferred_push(deferred_push_content_history_path, DISPLAYLIST_CONTENT_HISTORY)
generic_deferred_push(deferred_push_core_information, DISPLAYLIST_CORE_INFO)
generic_deferred_push(deferred_push_disc_information, DISPLAYLIST_DISC_INFO)
generic_deferred_push(deferred_push_system_information, DISPLAYLIST_SYSTEM_INFO)
generic_deferred_push(deferred_push_network_information, DISPLAYLIST_NETWORK_INFO)
generic_deferred_push(deferred_push_achievement_list, DISPLAYLIST_ACHIEVEMENT_LIST)
@ -944,6 +945,11 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_core_information);
}
else if (strstr(label,
msg_hash_to_str(MENU_ENUM_LABEL_DISC_INFORMATION)))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_disc_information);
}
#ifdef HAVE_LAKKA_SWITCH
else if (strstr(label,
msg_hash_to_str(MENU_ENUM_LABEL_SWITCH_GPU_PROFILE)))

View File

@ -6043,6 +6043,7 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_CORE_CHEAT_OPTIONS:
case MENU_ENUM_LABEL_CORE_INPUT_REMAPPING_OPTIONS:
case MENU_ENUM_LABEL_CORE_INFORMATION:
case MENU_ENUM_LABEL_DISC_INFORMATION:
case MENU_ENUM_LABEL_SYSTEM_INFORMATION:
case MENU_ENUM_LABEL_NETWORK_INFORMATION:
case MENU_ENUM_LABEL_ACHIEVEMENT_LIST:

View File

@ -2188,6 +2188,12 @@ static int menu_displaylist_parse_information_list(
MENU_ENUM_LABEL_CORE_INFORMATION,
MENU_SETTING_ACTION, 0, 0);
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DISC_INFORMATION),
msg_hash_to_str(MENU_ENUM_LABEL_DISC_INFORMATION),
MENU_ENUM_LABEL_DISC_INFORMATION,
MENU_SETTING_ACTION, 0, 0);
#ifdef HAVE_NETWORKING
#ifndef HAVE_SOCKET_LEGACY
menu_entries_append_enum(info->list,
@ -4896,6 +4902,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
switch (type)
{
#ifdef HAVE_CDROM
case DISPLAYLIST_DISC_INFO:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
info->need_push = true;
break;
case DISPLAYLIST_DUMP_DISC:
{
int i;
@ -4907,10 +4917,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
for (i = 0; list && i < list->size; i++)
{
char drive_string[256] = {0};
char drive[2] = {0};
size_t pos = 0;
char drive[2] = {0};
size_t pos = 0;
drive[0] = list->elems[i].attr.i;
drive[0] = list->elems[i].attr.i;
pos += snprintf(drive_string + pos, sizeof(drive_string) - pos, msg_hash_to_str(MSG_DRIVE_NUMBER), i + 1);
pos += snprintf(drive_string + pos, sizeof(drive_string) - pos, ": %s", list->elems[i].data);
@ -4949,10 +4959,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
for (i = 0; list && i < list->size; i++)
{
char drive_string[256] = {0};
char drive[2] = {0};
size_t pos = 0;
char drive[2] = {0};
size_t pos = 0;
drive[0] = list->elems[i].attr.i;
drive[0] = list->elems[i].attr.i;
pos += snprintf(drive_string + pos, sizeof(drive_string) - pos, msg_hash_to_str(MSG_DRIVE_NUMBER), i + 1);
pos += snprintf(drive_string + pos, sizeof(drive_string) - pos, ": %s", list->elems[i].data);
@ -4980,6 +4990,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
break;
}
#else
case DISPLAYLIST_DISC_INFO:
case DISPLAYLIST_LOAD_DISC:
case DISPLAYLIST_DUMP_DISC:
/* No-op */

View File

@ -94,6 +94,7 @@ enum menu_displaylist_ctl_state
DISPLAYLIST_CORES_DETECTED,
DISPLAYLIST_CORE_OPTIONS,
DISPLAYLIST_CORE_INFO,
DISPLAYLIST_DISC_INFO,
DISPLAYLIST_PERFCOUNTERS_CORE,
DISPLAYLIST_PERFCOUNTERS_FRONTEND,
DISPLAYLIST_SHADER_PASS,

View File

@ -1736,6 +1736,7 @@ enum msg_hash_enums
MENU_LABEL(ACHIEVEMENT_PAUSE),
MENU_LABEL(ACHIEVEMENT_RESUME),
MENU_LABEL(CORE_INFORMATION),
MENU_LABEL(DISC_INFORMATION),
MENU_LABEL(CORE_DELETE),
MENU_LABEL(VIDEO_SHADER_PARAMETERS),