diff --git a/intl/msg_hash_ar.h b/intl/msg_hash_ar.h index c6d297a00f..32b1e23005 100644 --- a/intl/msg_hash_ar.h +++ b/intl/msg_hash_ar.h @@ -1016,6 +1016,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY, "Load Recent") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST, "تحميل المحتوى") +MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_DISC, + "Load Disc") +MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMP_DISC, + "Dump Disc") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_STATE, "Load State") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCATION_ALLOW, diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h index d891ff07e8..be4b6d06a3 100644 --- a/intl/msg_hash_chs.h +++ b/intl/msg_hash_chs.h @@ -1010,6 +1010,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY, "加载最近的游戏内容") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST, "载入游戏内容") +MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_DISC, + "Load Disc") +MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMP_DISC, + "Dump Disc") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_STATE, "即时读档") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCATION_ALLOW, diff --git a/intl/msg_hash_cht.h b/intl/msg_hash_cht.h index 4d4884f12c..f03d4450e8 100644 --- a/intl/msg_hash_cht.h +++ b/intl/msg_hash_cht.h @@ -950,6 +950,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY, "戴入最近的遊戲內容") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST, "載入遊戲內容") +MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_DISC, + "Load Disc") +MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMP_DISC, + "Dump Disc") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_STATE, "戴入狀態") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCATION_ALLOW, diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index 8b1899d9ee..6d3562d069 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -987,6 +987,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY, "Inhalt aus Verlauf laden") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST, "Inhalt laden") +MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_DISC, + "Load Disc") +MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMP_DISC, + "Dump Disc") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_STATE, "Spielstand laden") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCATION_ALLOW, diff --git a/intl/msg_hash_el.h b/intl/msg_hash_el.h index ca6d39f577..b9f9a560a9 100644 --- a/intl/msg_hash_el.h +++ b/intl/msg_hash_el.h @@ -1526,6 +1526,10 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST, "Φόρτωση Περιεχομένου" ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_DISC, + "Load Disc") +MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMP_DISC, + "Dump Disc") MSG_HASH( MENU_ENUM_LABEL_VALUE_LOAD_STATE, "Φόρτωση Κατάστασης" diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index 3f47681aaf..c0be20d84d 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -871,6 +871,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY, "Load Recent") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST, "Load Content") +MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_DISC, + "Load Disc") +MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMP_DISC, + "Dump Disc") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_STATE, "Load State") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCATION_ALLOW, diff --git a/intl/msg_hash_es.h b/intl/msg_hash_es.h index e03cb223ae..710f61162a 100644 --- a/intl/msg_hash_es.h +++ b/intl/msg_hash_es.h @@ -1580,6 +1580,10 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST, "Cargar Contenido" ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_DISC, + "Load Disc") +MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMP_DISC, + "Dump Disc") MSG_HASH( MENU_ENUM_LABEL_VALUE_LOAD_STATE, "Cargar rápida" diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index 85654af30f..cf86a66623 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -1617,6 +1617,10 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST, "Charger du contenu" ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_DISC, + "Load Disc") +MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMP_DISC, + "Dump Disc") MSG_HASH( MENU_ENUM_LABEL_VALUE_LOAD_STATE, "Charger une sauvegarde instantanée" diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h index 84d9533a24..8fd0d4302a 100644 --- a/intl/msg_hash_it.h +++ b/intl/msg_hash_it.h @@ -989,6 +989,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY, "Carica Recenti") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST, "Carica Contenuto") +MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_DISC, + "Load Disc") +MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMP_DISC, + "Dump Disc") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_STATE, "Carica Stato") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCATION_ALLOW, diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index a553d8c94e..c6fa7fa90a 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -1628,6 +1628,10 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST, "コンテンツをロード" ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_DISC, + "Load Disc") +MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMP_DISC, + "Dump Disc") MSG_HASH( MENU_ENUM_LABEL_VALUE_LOAD_STATE, "ステートロード" diff --git a/intl/msg_hash_ko.h b/intl/msg_hash_ko.h index 006f02167c..775d80c7e5 100644 --- a/intl/msg_hash_ko.h +++ b/intl/msg_hash_ko.h @@ -1620,6 +1620,10 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST, "컨텐츠 불러오기" ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_DISC, + "Load Disc") +MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMP_DISC, + "Dump Disc") MSG_HASH( MENU_ENUM_LABEL_VALUE_LOAD_STATE, "상태저장 불러오기" diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index 0ca6227c36..49387fe8d9 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -870,6 +870,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY, "Recentelijk gebruikt") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST, "Laad Inhoud") +MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_DISC, + "Laad Disc") +MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMP_DISC, + "Dump Disc") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_STATE, "Laad State") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCATION_ALLOW, diff --git a/intl/msg_hash_pl.h b/intl/msg_hash_pl.h index 25b73ff2ed..c39658ed0f 100644 --- a/intl/msg_hash_pl.h +++ b/intl/msg_hash_pl.h @@ -1021,6 +1021,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY, "Załaduj ostatnie") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST, "Załaduj zawartość") +MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_DISC, + "Load Disc") +MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMP_DISC, + "Dump Disc") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_STATE, "Wczytaj zapis") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCATION_ALLOW, diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h index a25c2cc3ca..9b457aaca0 100644 --- a/intl/msg_hash_pt_br.h +++ b/intl/msg_hash_pt_br.h @@ -1616,6 +1616,10 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST, "Carregar Conteúdo" ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_DISC, + "Load Disc") +MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMP_DISC, + "Dump Disc") MSG_HASH( MENU_ENUM_LABEL_VALUE_LOAD_STATE, "Carregar Estado de Jogo" diff --git a/intl/msg_hash_pt_pt.h b/intl/msg_hash_pt_pt.h index 4fc3709134..b45942c742 100644 --- a/intl/msg_hash_pt_pt.h +++ b/intl/msg_hash_pt_pt.h @@ -935,6 +935,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY, "Carregar conteúdo recente") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST, "Carregar conteúdo") +MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_DISC, + "Load Disc") +MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMP_DISC, + "Dump Disc") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_STATE, "Carregar estado") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCATION_ALLOW, diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 8bd0f717fa..0ad21573bb 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -953,6 +953,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY, "Загрузить последние") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST, "Загрузить контент") +MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_DISC, + "Load Disc") +MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMP_DISC, + "Dump Disc") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_STATE, "Загрузить состояние") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCATION_ALLOW, diff --git a/intl/msg_hash_tr.h b/intl/msg_hash_tr.h index fd8daab526..cf25012036 100644 --- a/intl/msg_hash_tr.h +++ b/intl/msg_hash_tr.h @@ -1612,6 +1612,10 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST, "İçerik yükle" ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_DISC, + "Load Disc") +MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMP_DISC, + "Dump Disc") MSG_HASH( MENU_ENUM_LABEL_VALUE_LOAD_STATE, "Kayıtlı Konumu Yükle" diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 746595e72d..246162c7c1 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -1612,6 +1612,10 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST, "Load Content" ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_DISC, + "Load Disc") +MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMP_DISC, + "Dump Disc") MSG_HASH( MENU_ENUM_LABEL_VALUE_LOAD_STATE, "Load State" diff --git a/intl/msg_hash_vn.h b/intl/msg_hash_vn.h index e272c589e9..98f43ab2d1 100644 --- a/intl/msg_hash_vn.h +++ b/intl/msg_hash_vn.h @@ -956,6 +956,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY, "Tải Recent") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST, "Tải Content") +MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_DISC, + "Load Disc") +MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMP_DISC, + "Dump Disc") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_STATE, "Tải State") MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCATION_ALLOW, diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index b1e47fb7e6..cc48c09d0d 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -4802,6 +4802,20 @@ static int action_ok_push_downloads_dir(const char *path, entry_idx, ACTION_OK_DL_CONTENT_LIST); } +static int action_ok_push_load_disc(const char *path, + const char *label, unsigned type, size_t idx, size_t entry_idx) +{ + /* TODO/FIXME - fill in - call a task here */ + return 0; +} + +static int action_ok_push_dump_disc(const char *path, + const char *label, unsigned type, size_t idx, size_t entry_idx) +{ + /* TODO/FIXME - fill in - call a task here */ + return 0; +} + int action_ok_push_filebrowser_list_dir_select(const char *path, const char *label, unsigned type, size_t idx, size_t entry_idx) { @@ -5905,6 +5919,12 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_ACCOUNTS_TWITCH: BIND_ACTION_OK(cbs, action_ok_push_accounts_twitch_list); break; + case MENU_ENUM_LABEL_LOAD_DISC: + BIND_ACTION_OK(cbs, action_ok_push_load_disc); + break; + case MENU_ENUM_LABEL_DUMP_DISC: + BIND_ACTION_OK(cbs, action_ok_push_dump_disc); + break; case MENU_ENUM_LABEL_SHADER_OPTIONS: case MENU_ENUM_LABEL_CORE_OPTIONS: case MENU_ENUM_LABEL_CORE_CHEAT_OPTIONS: diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index f40dd80bec..d8133e60cc 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -2111,6 +2111,12 @@ static int materialui_list_push(void *data, void *userdata, menu_displaylist_setting(&entry); } + entry.enum_idx = MENU_ENUM_LABEL_LOAD_DISC; + menu_displaylist_setting(&entry); + + entry.enum_idx = MENU_ENUM_LABEL_DUMP_DISC; + menu_displaylist_setting(&entry); + #if defined(HAVE_NETWORKING) #ifdef HAVE_LAKKA entry.enum_idx = MENU_ENUM_LABEL_UPDATE_LAKKA; diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 7111e99356..3f7efd06f8 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -5689,6 +5689,12 @@ static int xmb_list_push(void *data, void *userdata, menu_subsystem_populate(subsystem, info); } + entry.enum_idx = MENU_ENUM_LABEL_LOAD_DISC; + menu_displaylist_setting(&entry); + + entry.enum_idx = MENU_ENUM_LABEL_DUMP_DISC; + menu_displaylist_setting(&entry); + entry.enum_idx = MENU_ENUM_LABEL_ADD_CONTENT_LIST; menu_displaylist_setting(&entry); #ifdef HAVE_QT diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index c5fe7f814c..67e4ea2f6f 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -7299,6 +7299,16 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, PARSE_ACTION, false) == 0) count++; + if (menu_displaylist_parse_settings_enum(info->list, + MENU_ENUM_LABEL_LOAD_DISC, + PARSE_ACTION, false) == 0) + count++; + + if (menu_displaylist_parse_settings_enum(info->list, + MENU_ENUM_LABEL_DUMP_DISC, + PARSE_ACTION, false) == 0) + count++; + if (string_is_equal(settings->arrays.menu_driver, "rgui") && #ifndef HAVE_LIBRETRODB settings->bools.menu_show_advanced_settings && diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 2b90e4e0cc..75b7d32707 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -6649,6 +6649,26 @@ static bool setting_append_list( parent_group); } +#ifdef HAVE_CDROM + /* TODO/FIXME - add check seeing if CDROM is inserted into tray + */ + CONFIG_ACTION( + list, list_info, + MENU_ENUM_LABEL_LOAD_DISC, + MENU_ENUM_LABEL_VALUE_LOAD_DISC, + &group_info, + &subgroup_info, + parent_group); + + CONFIG_ACTION( + list, list_info, + MENU_ENUM_LABEL_DUMP_DISC, + MENU_ENUM_LABEL_VALUE_DUMP_DISC, + &group_info, + &subgroup_info, + parent_group); +#endif + if (string_is_not_equal(settings->arrays.menu_driver, "xmb") && string_is_not_equal(settings->arrays.menu_driver, "ozone")) { CONFIG_ACTION( diff --git a/msg_hash.h b/msg_hash.h index b8eb112b90..34f3b570f7 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1721,6 +1721,8 @@ enum msg_hash_enums MENU_LABEL(FRONTEND_COUNTERS), MENU_LABEL(CORE_COUNTERS), MENU_LABEL(LOAD_CONTENT_HISTORY), + MENU_LABEL(LOAD_DISC), + MENU_LABEL(DUMP_DISC), MENU_LABEL(NETWORK_INFORMATION), MENU_LABEL(SYSTEM_INFORMATION), MENU_LABEL(ACHIEVEMENT_LIST),