From 6a6b230d8e570abf3a4d4f5765976ba69e7ac805 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 29 Nov 2015 01:57:16 +0100
Subject: [PATCH] (Wii) Fixups

---
 defaults.h                     | 81 ++++++++++++++++++++++++++++++++++
 frontend/drivers/platform_gx.c |  4 +-
 frontend/frontend_driver.c     |  2 +-
 frontend/frontend_salamander.c |  3 +-
 general.h                      | 52 +---------------------
 5 files changed, 87 insertions(+), 55 deletions(-)
 create mode 100644 defaults.h

diff --git a/defaults.h b/defaults.h
new file mode 100644
index 0000000000..999b69401b
--- /dev/null
+++ b/defaults.h
@@ -0,0 +1,81 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
+ * 
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __RARCH_DEFAULTS_H
+#define __RARCH_DEFAULTS_H
+
+#include <stdint.h>
+
+#include <retro_miscellaneous.h>
+
+#ifndef IS_SALAMANDER
+#include "playlist.h"
+#endif
+
+struct defaults
+{
+   struct
+   {
+      char core_assets[PATH_MAX_LENGTH];
+      char menu_config[PATH_MAX_LENGTH];
+      char autoconfig[PATH_MAX_LENGTH];
+      char audio_filter[PATH_MAX_LENGTH];
+      char video_filter[PATH_MAX_LENGTH];
+      char assets[PATH_MAX_LENGTH];
+      char core[PATH_MAX_LENGTH];
+      char core_info[PATH_MAX_LENGTH];
+      char overlay[PATH_MAX_LENGTH];
+      char osk_overlay[PATH_MAX_LENGTH];
+      char port[PATH_MAX_LENGTH];
+      char shader[PATH_MAX_LENGTH];
+      char savestate[PATH_MAX_LENGTH];
+      char resampler[PATH_MAX_LENGTH];
+      char sram[PATH_MAX_LENGTH];
+      char screenshot[PATH_MAX_LENGTH];
+      char system[PATH_MAX_LENGTH];
+      char playlist[PATH_MAX_LENGTH];
+      char content_history[PATH_MAX_LENGTH];
+      char remap[PATH_MAX_LENGTH];
+      char cache[PATH_MAX_LENGTH];
+      char wallpapers[PATH_MAX_LENGTH];
+      char database[PATH_MAX_LENGTH];
+      char cursor[PATH_MAX_LENGTH];
+      char cheats[PATH_MAX_LENGTH];
+   } dir;
+
+   struct
+   {
+      char config[PATH_MAX_LENGTH];
+      char core[PATH_MAX_LENGTH];
+      char buildbot_server_url[PATH_MAX_LENGTH];
+   } path;
+
+   struct
+   {
+      int out_latency;
+      float video_refresh_rate;
+      bool video_threaded_enable;
+   } settings; 
+
+#ifndef IS_SALAMANDER
+   content_playlist_t *history;
+#endif
+};
+
+/* Public data structures. */
+extern struct defaults g_defaults;
+
+
+#endif
diff --git a/frontend/drivers/platform_gx.c b/frontend/drivers/platform_gx.c
index 334a8d889b..81674df97e 100644
--- a/frontend/drivers/platform_gx.c
+++ b/frontend/drivers/platform_gx.c
@@ -34,8 +34,8 @@
 #include <file/file_list.h>
 #endif
 
-#include "../../driver.h"
-#include "../../general.h"
+#include "../frontend_driver.h"
+#include "../../defaults.h"
 #include "../../libretro_private.h"
 #include "../../defines/gx_defines.h"
 
diff --git a/frontend/frontend_driver.c b/frontend/frontend_driver.c
index 508a55a730..bce144de42 100644
--- a/frontend/frontend_driver.c
+++ b/frontend/frontend_driver.c
@@ -16,7 +16,7 @@
 
 #include <string.h>
 
-#include "../driver.h"
+#include "frontend_driver.h"
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
diff --git a/frontend/frontend_salamander.c b/frontend/frontend_salamander.c
index 38eef70a15..b9c97af036 100644
--- a/frontend/frontend_salamander.c
+++ b/frontend/frontend_salamander.c
@@ -22,9 +22,10 @@
 #include <file/config_file.h>
 #include <file/file_path.h>
 #include <file/dir_list.h>
+#include <retro_miscellaneous.h>
 
 #include "frontend_driver.h"
-#include "../general.h"
+#include "../defaults.h"
 #include "../file_ext.h"
 #include "../verbosity.h"
 
diff --git a/general.h b/general.h
index 02c9698025..9706e9a8f7 100644
--- a/general.h
+++ b/general.h
@@ -44,6 +44,7 @@
 #include "driver.h"
 #include "playlist.h"
 #include "runloop.h"
+#include "defaults.h"
 #include "verbosity.h"
 
 #ifdef HAVE_CONFIG_H
@@ -74,57 +75,6 @@ enum sound_mode_enums
    SOUND_MODE_LAST
 };
 
-struct defaults
-{
-   struct
-   {
-      char core_assets[PATH_MAX_LENGTH];
-      char menu_config[PATH_MAX_LENGTH];
-      char autoconfig[PATH_MAX_LENGTH];
-      char audio_filter[PATH_MAX_LENGTH];
-      char video_filter[PATH_MAX_LENGTH];
-      char assets[PATH_MAX_LENGTH];
-      char core[PATH_MAX_LENGTH];
-      char core_info[PATH_MAX_LENGTH];
-      char overlay[PATH_MAX_LENGTH];
-      char osk_overlay[PATH_MAX_LENGTH];
-      char port[PATH_MAX_LENGTH];
-      char shader[PATH_MAX_LENGTH];
-      char savestate[PATH_MAX_LENGTH];
-      char resampler[PATH_MAX_LENGTH];
-      char sram[PATH_MAX_LENGTH];
-      char screenshot[PATH_MAX_LENGTH];
-      char system[PATH_MAX_LENGTH];
-      char playlist[PATH_MAX_LENGTH];
-      char content_history[PATH_MAX_LENGTH];
-      char remap[PATH_MAX_LENGTH];
-      char cache[PATH_MAX_LENGTH];
-      char wallpapers[PATH_MAX_LENGTH];
-      char database[PATH_MAX_LENGTH];
-      char cursor[PATH_MAX_LENGTH];
-      char cheats[PATH_MAX_LENGTH];
-   } dir;
-
-   struct
-   {
-      char config[PATH_MAX_LENGTH];
-      char core[PATH_MAX_LENGTH];
-      char buildbot_server_url[PATH_MAX_LENGTH];
-   } path;
-
-   struct
-   {
-      int out_latency;
-      float video_refresh_rate;
-      bool video_threaded_enable;
-   } settings; 
-
-   content_playlist_t *history;
-};
-
-/* Public data structures. */
-extern struct defaults g_defaults;
-
 #ifdef __cplusplus
 }
 #endif