From dfe753042fad4edfb250ff52b288e02bb2b1733b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 28 Apr 2017 19:04:09 +0200 Subject: [PATCH] Cleanups --- configuration.h | 22 ++++++---------------- intl/msg_hash_chs.h | 4 ---- intl/msg_hash_de.h | 4 ---- intl/msg_hash_eo.h | 4 ---- intl/msg_hash_es.c | 2 -- intl/msg_hash_fr.h | 4 ---- intl/msg_hash_it.h | 2 -- intl/msg_hash_ja.h | 4 ---- intl/msg_hash_ko.h | 4 ---- intl/msg_hash_lbl.h | 2 -- intl/msg_hash_nl.h | 4 ---- intl/msg_hash_pl.c | 2 -- intl/msg_hash_pt_br.c | 2 -- intl/msg_hash_pt_br.h | 4 ---- intl/msg_hash_pt_pt.c | 2 -- intl/msg_hash_pt_pt.h | 4 ---- intl/msg_hash_ru.h | 4 ---- intl/msg_hash_us.h | 4 ---- intl/msg_hash_vn.c | 2 -- msg_hash.h | 1 - 20 files changed, 6 insertions(+), 75 deletions(-) diff --git a/configuration.h b/configuration.h index b739bfdc33..5a148cf61a 100644 --- a/configuration.h +++ b/configuration.h @@ -380,11 +380,6 @@ typedef struct settings unsigned poll_type_behavior; } input; - struct - { - unsigned mode; - } archive; - struct { char buildbot_url[255]; @@ -403,9 +398,6 @@ typedef struct settings int state_slot; - unsigned bundle_assets_extract_version_current; - unsigned bundle_assets_extract_last_version; - struct { char cheat_database[PATH_MAX_LENGTH]; @@ -465,23 +457,21 @@ typedef struct settings } netplay; #endif + unsigned bundle_assets_extract_version_current; + unsigned bundle_assets_extract_last_version; unsigned content_history_size; - unsigned libretro_log_level; - - size_t rewind_buffer_size; unsigned rewind_granularity; - - unsigned autosave_interval; - unsigned network_cmd_port; unsigned network_remote_base_port; - - char username[32]; #ifdef HAVE_LANGEXTRA unsigned int user_language; #endif + + size_t rewind_buffer_size; + + char username[32]; } settings_t; #define configuration_set_float(settings, var, newvar) \ diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h index 342eeadecc..d0ce188502 100644 --- a/intl/msg_hash_chs.h +++ b/intl/msg_hash_chs.h @@ -207,10 +207,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_NETPLAY_TAB, "联机游戏房间" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_ARCHIVE_MODE, - "Archive File Association Action" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_ASK_ARCHIVE, "询问" diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index 239c63e218..25b531c248 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -202,10 +202,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_NETPLAY_TAB, "Netplay-Räume" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_ARCHIVE_MODE, - "Verknüpfte Aktion für Archivdateien" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_ASK_ARCHIVE, "Nachfragen" diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index 671eb27dc7..dfe69d6cc1 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -135,10 +135,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_ADD_TAB, "Import content" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_ARCHIVE_MODE, - "Archive File Association Action" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_ASK_ARCHIVE, "Ask" diff --git a/intl/msg_hash_es.c b/intl/msg_hash_es.c index d0fcf01819..7a1ac0d3c1 100644 --- a/intl/msg_hash_es.c +++ b/intl/msg_hash_es.c @@ -1511,8 +1511,6 @@ const char *msg_hash_to_str_es(enum msg_hash_enums msg) #endif case MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_LIST: return "Lista de logros"; - case MENU_ENUM_LABEL_VALUE_ARCHIVE_MODE: - return "Acción para asociar tipos de archivo"; case MENU_ENUM_LABEL_VALUE_ASSETS_DIRECTORY: return "Carpeta de recursos"; case MENU_ENUM_LABEL_VALUE_AUDIO_BLOCK_FRAMES: diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index acec9e022d..134d818e0c 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -135,10 +135,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_ADD_TAB, "Scanner" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_ARCHIVE_MODE, - "Mode d'ouverture des archives" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_ASK_ARCHIVE, "Demander" diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h index 925b43e3a2..3e9d9d724d 100644 --- a/intl/msg_hash_it.h +++ b/intl/msg_hash_it.h @@ -186,8 +186,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_NETPLAY_TAB, "Netplay Rooms" ) -MSG_HASH(MENU_ENUM_LABEL_VALUE_ARCHIVE_MODE, - "Azione per associare i tipi di archivio") MSG_HASH(MENU_ENUM_LABEL_VALUE_ASK_ARCHIVE, "Chiedi") MSG_HASH(MENU_ENUM_LABEL_VALUE_ASSETS_DIRECTORY, diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index 657b19d66b..01b3565423 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -208,10 +208,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_NETPLAY_TAB, "ネットプレイのルーム表" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_ARCHIVE_MODE, - "Archive File Association Action" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_ASK_ARCHIVE, "Ask" diff --git a/intl/msg_hash_ko.h b/intl/msg_hash_ko.h index a240fa9993..a3354090ca 100644 --- a/intl/msg_hash_ko.h +++ b/intl/msg_hash_ko.h @@ -202,10 +202,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_NETPLAY_TAB, "넷플레이" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_ARCHIVE_MODE, - "압축 파일 연결 작업" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_ASK_ARCHIVE, "묻기" diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index 663db375f5..a08868599e 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -16,8 +16,6 @@ MSG_HASH(MENU_ENUM_LABEL_ADD_TAB, "add_tab") MSG_HASH(MENU_ENUM_LABEL_NETPLAY_TAB, "netplay_tab") -MSG_HASH(MENU_ENUM_LABEL_ARCHIVE_MODE, - "archive_mode") MSG_HASH(MENU_ENUM_LABEL_ASSETS_DIRECTORY, "assets_directory") MSG_HASH(MENU_ENUM_LABEL_AUDIO_BLOCK_FRAMES, diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index b2790f0b05..2498faf82a 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -135,10 +135,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_ADD_TAB, "Importeer inhoud" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_ARCHIVE_MODE, - "Archief Bestand Associatie" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_ASK_ARCHIVE, "Keuze" diff --git a/intl/msg_hash_pl.c b/intl/msg_hash_pl.c index efa5cd5417..529db5cb49 100644 --- a/intl/msg_hash_pl.c +++ b/intl/msg_hash_pl.c @@ -44,8 +44,6 @@ const char *msg_hash_to_str_pl(enum msg_hash_enums msg) { case MENU_ENUM_LABEL_VALUE_ADD_CONTENT_LIST: return "Dodaj treść"; - case MENU_ENUM_LABEL_VALUE_ARCHIVE_MODE: - return "Archive File Association Action"; case MENU_ENUM_LABEL_VALUE_ASK_ARCHIVE: return "Pytaj"; case MENU_ENUM_LABEL_VALUE_ASSETS_DIRECTORY: diff --git a/intl/msg_hash_pt_br.c b/intl/msg_hash_pt_br.c index 6a8b8d9483..3ab57c5bf6 100644 --- a/intl/msg_hash_pt_br.c +++ b/intl/msg_hash_pt_br.c @@ -951,8 +951,6 @@ const char *msg_hash_to_str_pt_br(enum msg_hash_enums msg) { switch (msg) { - case MENU_ENUM_LABEL_VALUE_ARCHIVE_MODE: - return "Ação para Arquivos Compactados"; case MENU_ENUM_LABEL_VALUE_ASK_ARCHIVE: return "Ask"; case MENU_ENUM_LABEL_VALUE_ASSETS_DIRECTORY: diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h index 67ba5fa38e..272fc6aecf 100644 --- a/intl/msg_hash_pt_br.h +++ b/intl/msg_hash_pt_br.h @@ -202,10 +202,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_NETPLAY_TAB, "Rooms de Netplay" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_ARCHIVE_MODE, - "Arquivar Arquivo de Associação de Ação" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_ASK_ARCHIVE, "Perguntar" diff --git a/intl/msg_hash_pt_pt.c b/intl/msg_hash_pt_pt.c index 606168e41a..f107022700 100644 --- a/intl/msg_hash_pt_pt.c +++ b/intl/msg_hash_pt_pt.c @@ -951,8 +951,6 @@ const char *msg_hash_to_str_pt_pt(enum msg_hash_enums msg) { switch (msg) { - case MENU_ENUM_LABEL_VALUE_ARCHIVE_MODE: - return "Ação para Arquivos Compactados"; case MENU_ENUM_LABEL_VALUE_ASK_ARCHIVE: return "Ask"; case MENU_ENUM_LABEL_VALUE_ASSETS_DIRECTORY: diff --git a/intl/msg_hash_pt_pt.h b/intl/msg_hash_pt_pt.h index bdfb0425ca..958bd751ce 100644 --- a/intl/msg_hash_pt_pt.h +++ b/intl/msg_hash_pt_pt.h @@ -202,10 +202,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_NETPLAY_TAB, "Salas de Netplay" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_ARCHIVE_MODE, - "Arquivar Arquivo de Associação de Ação" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_ASK_ARCHIVE, "Perguntar" diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 8a2b4d53b1..a99455888f 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -140,10 +140,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_ADD_TAB, "Import content" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_ARCHIVE_MODE, - "Archive File Association Action" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_ASK_ARCHIVE, "Ask" diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 48db9116d7..80c51041ed 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -202,10 +202,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_NETPLAY_TAB, "Netplay Rooms" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_ARCHIVE_MODE, - "Archive File Association Action" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_ASK_ARCHIVE, "Ask" diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c index e25afba471..908e496bf4 100644 --- a/intl/msg_hash_vn.c +++ b/intl/msg_hash_vn.c @@ -1953,8 +1953,6 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg) return "Thêm nội dung"; case MENU_ENUM_LABEL_VALUE_ADD_TAB: return "Tạo nội dung"; - case MENU_ENUM_LABEL_VALUE_ARCHIVE_MODE: - return "Archive File Association Action"; case MENU_ENUM_LABEL_VALUE_ASK_ARCHIVE: return "Hỏi"; case MENU_ENUM_LABEL_VALUE_ASSETS_DIRECTORY: diff --git a/msg_hash.h b/msg_hash.h index 69c5c80dfe..4b26ef75e7 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -941,7 +941,6 @@ enum msg_hash_enums MSG_APPLICATION_DIR, MSG_EXTERNAL_APPLICATION_DIR, - MENU_LABEL(ARCHIVE_MODE), MENU_LABEL(SHADER_OPTIONS), MENU_LABEL(USE_THIS_DIRECTORY), MENU_LABEL(CORE_OPTIONS),