[MPlayer-cvslog] r33838 - in trunk/gui: cfg.c cfg.h interface.c interface.h ui/gtk/playlist.c

[ib]

Author: ib
Date: Thu Jul  7 16:35:31 2011
New Revision: 33838

Log:
Remove variable holding history of selected files from interface.[ch].

Move it to cfg.[ch] instead.

Additionally, remove needless explicit initialization.

Modified:
   trunk/gui/cfg.c
   trunk/gui/cfg.h
   trunk/gui/interface.c
   trunk/gui/interface.h
   trunk/gui/ui/gtk/playlist.c

Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c	Thu Jul  7 16:20:35 2011	(r33837)
+++ trunk/gui/cfg.c	Thu Jul  7 16:35:31 2011	(r33838)
@@ -103,6 +103,8 @@ int guiWinID = -1;
 
 char *skinName;
 
+char *fsHistory[fsPersistant_MaxPos];
+
 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 16:20:35 2011	(r33837)
+++ trunk/gui/cfg.h	Thu Jul  7 16:35:31 2011	(r33838)
@@ -87,6 +87,9 @@ extern int guiWinID;
 
 extern char *skinName;
 
+#define fsPersistant_MaxPos 5
+extern char *fsHistory[fsPersistant_MaxPos];
+
 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 16:20:35 2011	(r33837)
+++ trunk/gui/interface.c	Thu Jul  7 16:35:31 2011	(r33838)
@@ -60,8 +60,6 @@ guiInterface_t guiInfo = {
     .Balance     = 50.0f
 };
 
-char *fsHistory[fsPersistant_MaxPos] = { NULL, NULL, NULL, NULL, NULL };
-
 static int initialized;
 
 /* MPlayer -> GUI */

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	Thu Jul  7 16:20:35 2011	(r33837)
+++ trunk/gui/interface.h	Thu Jul  7 16:35:31 2011	(r33838)
@@ -79,8 +79,6 @@ extern int use_gui;             // this 
 #define gtkSetFontAutoScale 21
 #define gtkSetSubEncoding   22
 
-#define fsPersistant_MaxPos 5
-
 typedef struct {
     int x;
     int y;
@@ -176,8 +174,6 @@ typedef struct {
 
 extern guiInterface_t guiInfo;
 
-extern char *fsHistory[fsPersistant_MaxPos];
-
 /* MPlayer -> GUI */
 
 void guiDone(void);

Modified: trunk/gui/ui/gtk/playlist.c
==============================================================================
--- trunk/gui/ui/gtk/playlist.c	Thu Jul  7 16:20:35 2011	(r33837)
+++ trunk/gui/ui/gtk/playlist.c	Thu Jul  7 16:35:31 2011	(r33838)
@@ -31,7 +31,7 @@
 #include "help_mp.h"
 #include "stream/stream.h"
 
-#include "gui/interface.h"
+#include "gui/cfg.h"
 #include "gui/ui/widgets.h"
 #include "gui/util/list.h"
 #include "gui/util/mem.h"