[MPlayer-cvslog] r33835 - in trunk/gui: cfg.c cfg.h interface.c interface.h

[ib]

Author: ib
Date: Thu Jul  7 16:09:57 2011
New Revision: 33835

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

Move them to cfg.[ch] instead.

Modified:
   trunk/gui/cfg.c
   trunk/gui/cfg.h
   trunk/gui/interface.c
   trunk/gui/interface.h

Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c	Thu Jul  7 15:46:59 2011	(r33834)
+++ trunk/gui/cfg.c	Thu Jul  7 16:09:57 2011	(r33835)
@@ -80,6 +80,7 @@ char *gtkAOSDLDriver;
 #endif
 
 int gtkEnableAudioEqualizer;
+float gtkEquChannels[6][10];
 
 int gtkSubDumpMPSub;
 int gtkSubDumpSrt;
@@ -98,6 +99,10 @@ int gui_main_pos_y = -3;
 int gui_sub_pos_x  = -3;
 int gui_sub_pos_y  = -3;
 
+int guiWinID = -1;
+
+char *skinName;
+
 static const m_option_t gui_opts[] = {
     { "cache",                       &gtkCacheOn,              CONF_TYPE_FLAG,        0,           0,     1,       NULL },
     { "cache_size",                  &gtkCacheSize,            CONF_TYPE_INT,         CONF_RANGE,  32,    1048576, NULL },

Modified: trunk/gui/cfg.h
==============================================================================
--- trunk/gui/cfg.h	Thu Jul  7 15:46:59 2011	(r33834)
+++ trunk/gui/cfg.h	Thu Jul  7 16:09:57 2011	(r33835)
@@ -59,6 +59,7 @@ extern char *gtkEquChannel3;
 extern char *gtkEquChannel4;
 extern char *gtkEquChannel5;
 extern char *gtkEquChannel6;
+extern float gtkEquChannels[6][10];
 
 extern int gtkSubDumpMPSub;
 extern int gtkSubDumpSrt;
@@ -82,6 +83,10 @@ extern int gui_main_pos_y;
 extern int gui_sub_pos_x;
 extern int gui_sub_pos_y;
 
+extern int guiWinID;
+
+extern char *skinName;
+
 int cfg_gui_include(m_option_t *conf, const char *filename);
 int cfg_read(void);
 int cfg_write(void);

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Thu Jul  7 15:46:59 2011	(r33834)
+++ trunk/gui/interface.c	Thu Jul  7 16:09:57 2011	(r33835)
@@ -60,16 +60,11 @@ guiInterface_t guiInfo = {
     .Balance     = 50.0f
 };
 
-int guiWinID = -1;
-
-char *skinName;
 char *skinDirInHome;
 char *skinMPlayerDir;
 
 char *fsHistory[fsPersistant_MaxPos] = { NULL, NULL, NULL, NULL, NULL };
 
-float gtkEquChannels[6][10];
-
 static int initialized;
 
 /* MPlayer -> GUI */

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	Thu Jul  7 15:46:59 2011	(r33834)
+++ trunk/gui/interface.h	Thu Jul  7 16:09:57 2011	(r33835)
@@ -176,16 +176,11 @@ typedef struct {
 
 extern guiInterface_t guiInfo;
 
-extern int guiWinID;
-
-extern char *skinName;
 extern char *skinDirInHome;
 extern char *skinMPlayerDir;
 
 extern char *fsHistory[fsPersistant_MaxPos];
 
-extern float gtkEquChannels[6][10];
-
 /* MPlayer -> GUI */
 
 void guiDone(void);