Mercurial > mplayer.hg

changeset 33750:8b5898908212

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove variable holding history of selected files from interface.[ch]. Move it to cfg.[ch] instead. Additionally, remove needless explicit initialization.
author ib
date Thu, 07 Jul 2011 14:35:31 +0000
parents d8f49edf8f25
children c28c967e40e9
files gui/cfg.c gui/cfg.h gui/interface.c gui/interface.h gui/ui/gtk/playlist.c
diffstat 5 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/gui/cfg.c	Thu Jul 07 14:20:35 2011 +0000
+++ b/gui/cfg.c	Thu Jul 07 14:35:31 2011 +0000
@@ -103,6 +103,8 @@
 
 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 },
--- a/gui/cfg.h	Thu Jul 07 14:20:35 2011 +0000
+++ b/gui/cfg.h	Thu Jul 07 14:35:31 2011 +0000
@@ -87,6 +87,9 @@
 
 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);
--- a/gui/interface.c	Thu Jul 07 14:20:35 2011 +0000
+++ b/gui/interface.c	Thu Jul 07 14:35:31 2011 +0000
@@ -60,8 +60,6 @@
     .Balance     = 50.0f
 };
 
-char *fsHistory[fsPersistant_MaxPos] = { NULL, NULL, NULL, NULL, NULL };
-
 static int initialized;
 
 /* MPlayer -> GUI */
--- a/gui/interface.h	Thu Jul 07 14:20:35 2011 +0000
+++ b/gui/interface.h	Thu Jul 07 14:35:31 2011 +0000
@@ -79,8 +79,6 @@
 #define gtkSetFontAutoScale 21
 #define gtkSetSubEncoding   22
 
-#define fsPersistant_MaxPos 5
-
 typedef struct {
     int x;
     int y;
@@ -176,8 +174,6 @@
 
 extern guiInterface_t guiInfo;
 
-extern char *fsHistory[fsPersistant_MaxPos];
-
 /* MPlayer -> GUI */
 
 void guiDone(void);
--- a/gui/ui/gtk/playlist.c	Thu Jul 07 14:20:35 2011 +0000
+++ b/gui/ui/gtk/playlist.c	Thu Jul 07 14:35:31 2011 +0000
@@ -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"