[MPlayer-cvslog] r33837 - in trunk/gui: interface.c interface.h skin/skin.c skin/skin.h ui/gtk/skinbrowser.c

[ib]

Author: ib
Date: Thu Jul  7 16:20:35 2011
New Revision: 33837

Log:
Remove skin related variables from interface.[ch].

Move them to skin.[ch] instead.

Modified:
   trunk/gui/interface.c
   trunk/gui/interface.h
   trunk/gui/skin/skin.c
   trunk/gui/skin/skin.h
   trunk/gui/ui/gtk/skinbrowser.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Thu Jul  7 16:13:17 2011	(r33836)
+++ trunk/gui/interface.c	Thu Jul  7 16:20:35 2011	(r33837)
@@ -60,9 +60,6 @@ guiInterface_t guiInfo = {
     .Balance     = 50.0f
 };
 
-char *skinDirInHome;
-char *skinMPlayerDir;
-
 char *fsHistory[fsPersistant_MaxPos] = { NULL, NULL, NULL, NULL, NULL };
 
 static int initialized;

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	Thu Jul  7 16:13:17 2011	(r33836)
+++ trunk/gui/interface.h	Thu Jul  7 16:20:35 2011	(r33837)
@@ -176,9 +176,6 @@ typedef struct {
 
 extern guiInterface_t guiInfo;
 
-extern char *skinDirInHome;
-extern char *skinMPlayerDir;
-
 extern char *fsHistory[fsPersistant_MaxPos];
 
 /* MPlayer -> GUI */

Modified: trunk/gui/skin/skin.c
==============================================================================
--- trunk/gui/skin/skin.c	Thu Jul  7 16:13:17 2011	(r33836)
+++ trunk/gui/skin/skin.c	Thu Jul  7 16:20:35 2011	(r33837)
@@ -38,6 +38,9 @@ typedef struct {
     int (*func)(char *in);
 } _item;
 
+char *skinDirInHome;
+char *skinMPlayerDir;
+
 static guiItems *skin;
 
 static int linenumber;

Modified: trunk/gui/skin/skin.h
==============================================================================
--- trunk/gui/skin/skin.h	Thu Jul  7 16:13:17 2011	(r33836)
+++ trunk/gui/skin/skin.h	Thu Jul  7 16:20:35 2011	(r33837)
@@ -21,6 +21,9 @@
 
 #include "gui/util/bitmap.h"
 
+extern char *skinDirInHome;
+extern char *skinMPlayerDir;
+
 int skinBPRead(char *fname, guiImage *bf);
 int skinRead(char *dname);
 

Modified: trunk/gui/ui/gtk/skinbrowser.c
==============================================================================
--- trunk/gui/ui/gtk/skinbrowser.c	Thu Jul  7 16:13:17 2011	(r33836)
+++ trunk/gui/ui/gtk/skinbrowser.c	Thu Jul  7 16:20:35 2011	(r33837)
@@ -28,7 +28,8 @@
 #include "tools.h"
 
 #include "gui/app.h"
-#include "gui/interface.h"
+#include "gui/cfg.h"
+#include "gui/skin/skin.h"
 #include "help_mp.h"
 
 #include "gui/ui/widgets.h"