From 9456f059913b09d5f8ae6fe96917d487e4ad8f91 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 18 Jun 2016 02:13:28 +0200
Subject: [PATCH] Move menu hashes to menu_hash.h
---
menu/menu_driver.h | 23 +++++++++++++++++++++++
menu/menu_hash.h | 26 ++++++++++++++++++++++++++
retroarch.h | 26 --------------------------
3 files changed, 49 insertions(+), 26 deletions(-)
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index a445015ff6..1d4fea9b81 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -252,6 +252,29 @@ enum menu_file_type
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
};
diff --git a/menu/menu_hash.h b/menu/menu_hash.h
index 5a8cccf5a1..34238d9018 100644
--- a/menu/menu_hash.h
+++ b/menu/menu_hash.h
@@ -2434,6 +2434,32 @@ enum menu_hash_enums
#define MENU_LABEL_VIDEO_SETTINGS 0x38b3db2cU
+#define MENU_VALUE_FILE_WEBM 0x7ca00b50U
+#define MENU_VALUE_FILE_F4F 0x0b886be5U
+#define MENU_VALUE_FILE_F4V 0x0b886bf5U
+#define MENU_VALUE_FILE_OGM 0x0b8898c8U
+#define MENU_VALUE_FILE_MKV 0x0b8890d3U
+#define MENU_VALUE_FILE_AVI 0x0b885f25U
+#define MENU_VALUE_FILE_M4A 0x0b8889a7U
+#define MENU_VALUE_FILE_3GP 0x0b87998fU
+#define MENU_VALUE_FILE_MP4 0x0b889136U
+#define MENU_VALUE_FILE_MP3 0x0b889135U
+#define MENU_VALUE_FILE_FLAC 0x7c96d67bU
+#define MENU_VALUE_FILE_OGG 0x0b8898c2U
+#define MENU_VALUE_FILE_FLV 0x0b88732dU
+#define MENU_VALUE_FILE_WAV 0x0b88ba13U
+#define MENU_VALUE_FILE_MOV 0x0b889157U
+#define MENU_VALUE_FILE_WMV 0x0b88bb9fU
+
+#define MENU_VALUE_FILE_JPG 0x0b8884a6U
+#define MENU_VALUE_FILE_JPEG 0x7c99198bU
+#define MENU_VALUE_FILE_JPG_CAPS 0x0b87f846U
+#define MENU_VALUE_FILE_JPEG_CAPS 0x7c87010bU
+#define MENU_VALUE_FILE_PNG 0x0b889deaU
+#define MENU_VALUE_FILE_PNG_CAPS 0x0b88118aU
+#define MENU_VALUE_FILE_TGA 0x0b88ae01U
+#define MENU_VALUE_FILE_BMP 0x0b886244U
+
const char *menu_hash_to_str_de_enum(enum menu_hash_enums msg);
int menu_hash_get_help_de(uint32_t hash, char *s, size_t len);
diff --git a/retroarch.h b/retroarch.h
index d580200834..4564a6c42e 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -25,32 +25,6 @@
RETRO_BEGIN_DECLS
-#define MENU_VALUE_FILE_WEBM 0x7ca00b50U
-#define MENU_VALUE_FILE_F4F 0x0b886be5U
-#define MENU_VALUE_FILE_F4V 0x0b886bf5U
-#define MENU_VALUE_FILE_OGM 0x0b8898c8U
-#define MENU_VALUE_FILE_MKV 0x0b8890d3U
-#define MENU_VALUE_FILE_AVI 0x0b885f25U
-#define MENU_VALUE_FILE_M4A 0x0b8889a7U
-#define MENU_VALUE_FILE_3GP 0x0b87998fU
-#define MENU_VALUE_FILE_MP4 0x0b889136U
-#define MENU_VALUE_FILE_MP3 0x0b889135U
-#define MENU_VALUE_FILE_FLAC 0x7c96d67bU
-#define MENU_VALUE_FILE_OGG 0x0b8898c2U
-#define MENU_VALUE_FILE_FLV 0x0b88732dU
-#define MENU_VALUE_FILE_WAV 0x0b88ba13U
-#define MENU_VALUE_FILE_MOV 0x0b889157U
-#define MENU_VALUE_FILE_WMV 0x0b88bb9fU
-
-#define MENU_VALUE_FILE_JPG 0x0b8884a6U
-#define MENU_VALUE_FILE_JPEG 0x7c99198bU
-#define MENU_VALUE_FILE_JPG_CAPS 0x0b87f846U
-#define MENU_VALUE_FILE_JPEG_CAPS 0x7c87010bU
-#define MENU_VALUE_FILE_PNG 0x0b889deaU
-#define MENU_VALUE_FILE_PNG_CAPS 0x0b88118aU
-#define MENU_VALUE_FILE_TGA 0x0b88ae01U
-#define MENU_VALUE_FILE_BMP 0x0b886244U
-
enum rarch_ctl_state
{
RARCH_CTL_NONE = 0,