From 7d93f63e6a1c39eeefd9ec00400b27be07c14dbf Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 20 Jun 2016 06:44:05 +0200 Subject: [PATCH] Move menu_hash_to_file_type to msg_hash --- menu/menu_driver.c | 105 ------------------------------------------- menu/menu_driver.h | 109 --------------------------------------------- msg_hash.c | 105 +++++++++++++++++++++++++++++++++++++++++++ msg_hash.h | 109 +++++++++++++++++++++++++++++++++++++++++++++ retroarch.c | 4 -- retroarch.h | 2 - 6 files changed, 214 insertions(+), 220 deletions(-) diff --git a/menu/menu_driver.c b/menu/menu_driver.c index 19c9fbf60e..44f09e7255 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -949,108 +949,3 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data) return true; } - -enum menu_file_type menu_hash_to_file_type(uint32_t hash) -{ - switch (hash) - { - case MENU_VALUE_COMP: - return MENU_FILE_COMPRESSED; - case MENU_VALUE_MORE: - return MENU_FILE_MORE; - case MENU_VALUE_CORE: - return MENU_FILE_CORE; - case MENU_VALUE_RDB: - return MENU_FILE_RDB; - case MENU_VALUE_CURSOR: - return MENU_FILE_CURSOR; - case MENU_VALUE_FILE: - return MENU_FILE_PLAIN; - case MENU_VALUE_DIR: - return MENU_FILE_DIRECTORY; - case MENU_VALUE_MUSIC: - return MENU_FILE_MUSIC; - case MENU_VALUE_IMAGE: - return MENU_FILE_IMAGE; - case MENU_VALUE_MOVIE: - return MENU_FILE_MOVIE; - case MENU_VALUE_ON: - return MENU_FILE_BOOL_ON; - case MENU_VALUE_OFF: - return MENU_FILE_BOOL_OFF; - case MENU_VALUE_GLSL: - return MENU_FILE_SHADER_GLSL; - case MENU_VALUE_HLSL: - return MENU_FILE_SHADER_HLSL; - case MENU_VALUE_CG: - return MENU_FILE_SHADER_HLSL; - case MENU_VALUE_SLANG: - return MENU_FILE_SHADER_SLANG; - case MENU_VALUE_GLSLP: - return MENU_FILE_SHADER_PRESET_GLSLP; - case MENU_VALUE_HLSLP: - return MENU_FILE_SHADER_PRESET_HLSLP; - case MENU_VALUE_CGP: - return MENU_FILE_SHADER_PRESET_HLSLP; - case MENU_VALUE_SLANGP: - return MENU_FILE_SHADER_PRESET_SLANGP; - case MENU_VALUE_CRC: - return MENU_FILE_CRC; - case MENU_VALUE_SHA1: - return MENU_FILE_SHA1; - case MENU_VALUE_MD5: - return MENU_FILE_MD5; -#ifdef HAVE_FFMPEG - case MENU_VALUE_FILE_OGM: - return MENU_FILE_OGM; - case MENU_VALUE_FILE_MKV: - return MENU_FILE_MKV; - case MENU_VALUE_FILE_AVI: - return MENU_FILE_AVI; - case MENU_VALUE_FILE_MP4: - return MENU_FILE_MP4; - case MENU_VALUE_FILE_FLV: - return MENU_FILE_FLV; - case MENU_VALUE_FILE_WEBM: - return MENU_FILE_WEBM; - case MENU_VALUE_FILE_3GP: - return MENU_FILE_3GP; - case MENU_VALUE_FILE_F4F: - return MENU_FILE_F4F; - case MENU_VALUE_FILE_F4V: - return MENU_FILE_F4V; - case MENU_VALUE_FILE_MOV: - return MENU_FILE_MOV; - case MENU_VALUE_FILE_WMV: - return MENU_FILE_WMV; - case MENU_VALUE_FILE_MP3: - return MENU_FILE_MP3; - case MENU_VALUE_FILE_M4A: - return MENU_FILE_M4A; - case MENU_VALUE_FILE_OGG: - return MENU_FILE_OGG; - case MENU_VALUE_FILE_FLAC: - return MENU_FILE_FLAC; - case MENU_VALUE_FILE_WAV: - return MENU_FILE_WAV; -#endif -#ifdef HAVE_IMAGEVIEWER - case MENU_VALUE_FILE_JPG: - case MENU_VALUE_FILE_JPG_CAPS: - case MENU_VALUE_FILE_JPEG: - case MENU_VALUE_FILE_JPEG_CAPS: - return MENU_FILE_JPEG; - case MENU_VALUE_FILE_PNG: - case MENU_VALUE_FILE_PNG_CAPS: - return MENU_FILE_PNG; - case MENU_VALUE_FILE_TGA: - return MENU_FILE_TGA; - case MENU_VALUE_FILE_BMP: - return MENU_FILE_BMP; -#endif - default: - break; - } - - return MENU_FILE_NONE; -} diff --git a/menu/menu_driver.h b/menu/menu_driver.h index 1d4fea9b81..4a65535e8f 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -171,113 +171,6 @@ enum rarch_menu_ctl_state RARCH_MENU_CTL_UPDATE_THUMBNAIL_IMAGE }; -enum menu_file_type -{ - MENU_FILE_NONE = 0, - MENU_FILE_PLAIN, - MENU_FILE_DIRECTORY, - MENU_FILE_PARENT_DIRECTORY, - MENU_FILE_PATH, - MENU_FILE_DEVICE, - MENU_FILE_CORE, - MENU_FILE_PLAYLIST_ENTRY, - MENU_FILE_CONTENTLIST_ENTRY, - MENU_FILE_SHADER_PRESET, - MENU_FILE_SHADER, - MENU_FILE_VIDEOFILTER, - MENU_FILE_AUDIOFILTER, - MENU_FILE_CHEAT, - MENU_FILE_OVERLAY, - MENU_FILE_FONT, - MENU_FILE_CONFIG, - MENU_FILE_USE_DIRECTORY, - MENU_FILE_SCAN_DIRECTORY, - MENU_FILE_CARCHIVE, - MENU_FILE_IN_CARCHIVE, - MENU_FILE_IMAGE, - MENU_FILE_IMAGEVIEWER, - MENU_FILE_REMAP, - MENU_FILE_DOWNLOAD_CORE, - MENU_FILE_DOWNLOAD_CORE_CONTENT, - MENU_FILE_DOWNLOAD_CORE_INFO, - MENU_FILE_DOWNLOAD_THUMBNAIL_CONTENT, - MENU_FILE_DOWNLOAD_LAKKA, - MENU_FILE_RDB, - MENU_FILE_RDB_ENTRY, - MENU_FILE_RPL_ENTRY, - MENU_FILE_CURSOR, - MENU_FILE_BOOL_ON, - MENU_FILE_BOOL_OFF, - MENU_FILE_RECORD_CONFIG, - MENU_FILE_PLAYLIST_COLLECTION, - MENU_FILE_PLAYLIST_ASSOCIATION, - MENU_FILE_MOVIE, - MENU_FILE_MUSIC, - MENU_FILE_SHADER_SLANG, - MENU_FILE_SHADER_GLSL, - MENU_FILE_SHADER_HLSL, - MENU_FILE_SHADER_CG, - MENU_FILE_SHADER_PRESET_GLSLP, - MENU_FILE_SHADER_PRESET_HLSLP, - MENU_FILE_SHADER_PRESET_CGP, - MENU_FILE_SHADER_PRESET_SLANGP, - MENU_SETTINGS, - MENU_SETTINGS_TAB, - MENU_HISTORY_TAB, - MENU_ADD_TAB, - MENU_PLAYLISTS_TAB, - MENU_SETTING_NO_ITEM, - MENU_SETTING_DRIVER, - MENU_SETTING_ACTION, - MENU_SETTING_ACTION_RUN, - MENU_SETTING_ACTION_CLOSE, - MENU_SETTING_ACTION_CORE_OPTIONS, - MENU_SETTING_ACTION_CORE_INPUT_REMAPPING_OPTIONS, - MENU_SETTING_ACTION_CORE_CHEAT_OPTIONS, - MENU_SETTING_ACTION_CORE_INFORMATION, - MENU_SETTING_ACTION_CORE_DISK_OPTIONS, - MENU_SETTING_ACTION_CORE_SHADER_OPTIONS, - MENU_SETTING_ACTION_SAVESTATE, - MENU_SETTING_ACTION_LOADSTATE, - MENU_SETTING_ACTION_SCREENSHOT, - MENU_SETTING_ACTION_RESET, - MENU_SETTING_STRING_OPTIONS, - MENU_SETTING_GROUP, - MENU_SETTING_SUBGROUP, - MENU_SETTING_HORIZONTAL_MENU, - MENU_INFO_MESSAGE, - MENU_FILE_DOWNLOAD_THUMBNAIL, - MENU_FILE_MORE, - MENU_FILE_COMPRESSED, - MENU_FILE_SHA1, - MENU_FILE_MD5, - MENU_FILE_CRC, - - MENU_FILE_WEBM, - MENU_FILE_F4F, - MENU_FILE_F4V, - MENU_FILE_OGM, - MENU_FILE_MKV, - MENU_FILE_AVI, - MENU_FILE_M4A, - MENU_FILE_3GP, - MENU_FILE_MP4, - MENU_FILE_MP3, - MENU_FILE_FLAC, - MENU_FILE_OGG, - MENU_FILE_FLV, - MENU_FILE_WAV, - MENU_FILE_MOV, - MENU_FILE_WMV, - - MENU_FILE_JPEG, - MENU_FILE_PNG, - MENU_FILE_TGA, - MENU_FILE_BMP, - - MENU_FILE_TYPE_T_LAST -}; - enum menu_settings_type { MENU_SETTINGS_NONE = MENU_FILE_TYPE_T_LAST + 1, @@ -507,8 +400,6 @@ const char* config_get_menu_driver_options(void); /* HACK */ extern unsigned int rdb_entry_start_game_selection_ptr; -enum menu_file_type menu_hash_to_file_type(uint32_t hash); - bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data); extern menu_ctx_driver_t menu_ctx_xui; diff --git a/msg_hash.c b/msg_hash.c index 78f0829f4e..6671cff703 100644 --- a/msg_hash.c +++ b/msg_hash.c @@ -125,3 +125,108 @@ uint32_t msg_hash_calculate(const char *s) { return djb2_calculate(s); } + +enum menu_file_type menu_hash_to_file_type(uint32_t hash) +{ + switch (hash) + { + case MENU_VALUE_COMP: + return MENU_FILE_COMPRESSED; + case MENU_VALUE_MORE: + return MENU_FILE_MORE; + case MENU_VALUE_CORE: + return MENU_FILE_CORE; + case MENU_VALUE_RDB: + return MENU_FILE_RDB; + case MENU_VALUE_CURSOR: + return MENU_FILE_CURSOR; + case MENU_VALUE_FILE: + return MENU_FILE_PLAIN; + case MENU_VALUE_DIR: + return MENU_FILE_DIRECTORY; + case MENU_VALUE_MUSIC: + return MENU_FILE_MUSIC; + case MENU_VALUE_IMAGE: + return MENU_FILE_IMAGE; + case MENU_VALUE_MOVIE: + return MENU_FILE_MOVIE; + case MENU_VALUE_ON: + return MENU_FILE_BOOL_ON; + case MENU_VALUE_OFF: + return MENU_FILE_BOOL_OFF; + case MENU_VALUE_GLSL: + return MENU_FILE_SHADER_GLSL; + case MENU_VALUE_HLSL: + return MENU_FILE_SHADER_HLSL; + case MENU_VALUE_CG: + return MENU_FILE_SHADER_HLSL; + case MENU_VALUE_SLANG: + return MENU_FILE_SHADER_SLANG; + case MENU_VALUE_GLSLP: + return MENU_FILE_SHADER_PRESET_GLSLP; + case MENU_VALUE_HLSLP: + return MENU_FILE_SHADER_PRESET_HLSLP; + case MENU_VALUE_CGP: + return MENU_FILE_SHADER_PRESET_HLSLP; + case MENU_VALUE_SLANGP: + return MENU_FILE_SHADER_PRESET_SLANGP; + case MENU_VALUE_CRC: + return MENU_FILE_CRC; + case MENU_VALUE_SHA1: + return MENU_FILE_SHA1; + case MENU_VALUE_MD5: + return MENU_FILE_MD5; +#ifdef HAVE_FFMPEG + case MENU_VALUE_FILE_OGM: + return MENU_FILE_OGM; + case MENU_VALUE_FILE_MKV: + return MENU_FILE_MKV; + case MENU_VALUE_FILE_AVI: + return MENU_FILE_AVI; + case MENU_VALUE_FILE_MP4: + return MENU_FILE_MP4; + case MENU_VALUE_FILE_FLV: + return MENU_FILE_FLV; + case MENU_VALUE_FILE_WEBM: + return MENU_FILE_WEBM; + case MENU_VALUE_FILE_3GP: + return MENU_FILE_3GP; + case MENU_VALUE_FILE_F4F: + return MENU_FILE_F4F; + case MENU_VALUE_FILE_F4V: + return MENU_FILE_F4V; + case MENU_VALUE_FILE_MOV: + return MENU_FILE_MOV; + case MENU_VALUE_FILE_WMV: + return MENU_FILE_WMV; + case MENU_VALUE_FILE_MP3: + return MENU_FILE_MP3; + case MENU_VALUE_FILE_M4A: + return MENU_FILE_M4A; + case MENU_VALUE_FILE_OGG: + return MENU_FILE_OGG; + case MENU_VALUE_FILE_FLAC: + return MENU_FILE_FLAC; + case MENU_VALUE_FILE_WAV: + return MENU_FILE_WAV; +#endif +#ifdef HAVE_IMAGEVIEWER + case MENU_VALUE_FILE_JPG: + case MENU_VALUE_FILE_JPG_CAPS: + case MENU_VALUE_FILE_JPEG: + case MENU_VALUE_FILE_JPEG_CAPS: + return MENU_FILE_JPEG; + case MENU_VALUE_FILE_PNG: + case MENU_VALUE_FILE_PNG_CAPS: + return MENU_FILE_PNG; + case MENU_VALUE_FILE_TGA: + return MENU_FILE_TGA; + case MENU_VALUE_FILE_BMP: + return MENU_FILE_BMP; +#endif + default: + break; + } + + return MENU_FILE_NONE; +} diff --git a/msg_hash.h b/msg_hash.h index 419d3b1d35..d818d65aef 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -24,6 +24,113 @@ RETRO_BEGIN_DECLS +enum menu_file_type +{ + MENU_FILE_NONE = 0, + MENU_FILE_PLAIN, + MENU_FILE_DIRECTORY, + MENU_FILE_PARENT_DIRECTORY, + MENU_FILE_PATH, + MENU_FILE_DEVICE, + MENU_FILE_CORE, + MENU_FILE_PLAYLIST_ENTRY, + MENU_FILE_CONTENTLIST_ENTRY, + MENU_FILE_SHADER_PRESET, + MENU_FILE_SHADER, + MENU_FILE_VIDEOFILTER, + MENU_FILE_AUDIOFILTER, + MENU_FILE_CHEAT, + MENU_FILE_OVERLAY, + MENU_FILE_FONT, + MENU_FILE_CONFIG, + MENU_FILE_USE_DIRECTORY, + MENU_FILE_SCAN_DIRECTORY, + MENU_FILE_CARCHIVE, + MENU_FILE_IN_CARCHIVE, + MENU_FILE_IMAGE, + MENU_FILE_IMAGEVIEWER, + MENU_FILE_REMAP, + MENU_FILE_DOWNLOAD_CORE, + MENU_FILE_DOWNLOAD_CORE_CONTENT, + MENU_FILE_DOWNLOAD_CORE_INFO, + MENU_FILE_DOWNLOAD_THUMBNAIL_CONTENT, + MENU_FILE_DOWNLOAD_LAKKA, + MENU_FILE_RDB, + MENU_FILE_RDB_ENTRY, + MENU_FILE_RPL_ENTRY, + MENU_FILE_CURSOR, + MENU_FILE_BOOL_ON, + MENU_FILE_BOOL_OFF, + MENU_FILE_RECORD_CONFIG, + MENU_FILE_PLAYLIST_COLLECTION, + MENU_FILE_PLAYLIST_ASSOCIATION, + MENU_FILE_MOVIE, + MENU_FILE_MUSIC, + MENU_FILE_SHADER_SLANG, + MENU_FILE_SHADER_GLSL, + MENU_FILE_SHADER_HLSL, + MENU_FILE_SHADER_CG, + MENU_FILE_SHADER_PRESET_GLSLP, + MENU_FILE_SHADER_PRESET_HLSLP, + MENU_FILE_SHADER_PRESET_CGP, + MENU_FILE_SHADER_PRESET_SLANGP, + MENU_SETTINGS, + MENU_SETTINGS_TAB, + MENU_HISTORY_TAB, + MENU_ADD_TAB, + MENU_PLAYLISTS_TAB, + MENU_SETTING_NO_ITEM, + MENU_SETTING_DRIVER, + MENU_SETTING_ACTION, + MENU_SETTING_ACTION_RUN, + MENU_SETTING_ACTION_CLOSE, + MENU_SETTING_ACTION_CORE_OPTIONS, + MENU_SETTING_ACTION_CORE_INPUT_REMAPPING_OPTIONS, + MENU_SETTING_ACTION_CORE_CHEAT_OPTIONS, + MENU_SETTING_ACTION_CORE_INFORMATION, + MENU_SETTING_ACTION_CORE_DISK_OPTIONS, + MENU_SETTING_ACTION_CORE_SHADER_OPTIONS, + MENU_SETTING_ACTION_SAVESTATE, + MENU_SETTING_ACTION_LOADSTATE, + MENU_SETTING_ACTION_SCREENSHOT, + MENU_SETTING_ACTION_RESET, + MENU_SETTING_STRING_OPTIONS, + MENU_SETTING_GROUP, + MENU_SETTING_SUBGROUP, + MENU_SETTING_HORIZONTAL_MENU, + MENU_INFO_MESSAGE, + MENU_FILE_DOWNLOAD_THUMBNAIL, + MENU_FILE_MORE, + MENU_FILE_COMPRESSED, + MENU_FILE_SHA1, + MENU_FILE_MD5, + MENU_FILE_CRC, + + MENU_FILE_WEBM, + MENU_FILE_F4F, + MENU_FILE_F4V, + MENU_FILE_OGM, + MENU_FILE_MKV, + MENU_FILE_AVI, + MENU_FILE_M4A, + MENU_FILE_3GP, + MENU_FILE_MP4, + MENU_FILE_MP3, + MENU_FILE_FLAC, + MENU_FILE_OGG, + MENU_FILE_FLV, + MENU_FILE_WAV, + MENU_FILE_MOV, + MENU_FILE_WMV, + + MENU_FILE_JPEG, + MENU_FILE_PNG, + MENU_FILE_TGA, + MENU_FILE_BMP, + + MENU_FILE_TYPE_T_LAST +}; + enum msg_hash_enums { MSG_UNKNOWN = 0, @@ -1906,6 +2013,8 @@ int menu_hash_get_help_us(uint32_t hash, char *s, size_t len); int menu_hash_get_help(uint32_t hash, char *s, size_t len); +enum menu_file_type menu_hash_to_file_type(uint32_t hash); + uint32_t msg_hash_calculate(const char *s); RETRO_END_DECLS diff --git a/retroarch.c b/retroarch.c index 59f4710531..0310c1bfab 100644 --- a/retroarch.c +++ b/retroarch.c @@ -564,7 +564,6 @@ const char *retroarch_get_current_savefile_dir(void) return ret; } -#ifdef HAVE_MENU enum rarch_content_type retroarch_path_is_media_type(const char *path) { switch (menu_hash_to_file_type(msg_hash_calculate(path_get_extension(path)))) @@ -603,7 +602,6 @@ enum rarch_content_type retroarch_path_is_media_type(const char *path) return RARCH_CONTENT_NONE; } -#endif #define FFMPEG_RECORD_ARG "r:" @@ -1301,7 +1299,6 @@ bool retroarch_main_init(int argc, char *argv[]) runloop_ctl(RUNLOOP_CTL_TASK_INIT, NULL); { -#ifdef HAVE_MENU settings_t *settings = config_get_ptr(); if (settings && (settings->multimedia.builtin_mediaplayer_enable || @@ -1339,7 +1336,6 @@ bool retroarch_main_init(int argc, char *argv[]) } } } -#endif } driver_ctl(RARCH_DRIVER_CTL_INIT_PRE, NULL); diff --git a/retroarch.h b/retroarch.h index a5beb50438..4564a6c42e 100644 --- a/retroarch.h +++ b/retroarch.h @@ -118,9 +118,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data); int retroarch_get_capabilities(enum rarch_capabilities type, char *s, size_t len); -#ifdef HAVE_MENU enum rarch_content_type retroarch_path_is_media_type(const char *path); -#endif const char *retroarch_get_current_savefile_dir(void);