[MPlayer-cvslog] r32987 - in trunk/gui: app.c app.h interface.c interface.h

[ib]

Author: ib
Date: Mon Feb 28 15:47:17 2011
New Revision: 32987

Log:
Move global skin directory variables.

The more appropriate place for these variables is interface.c, because
this is where they are set after all. Furthermore, their needless explicit
initialization has been removed.

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

Modified: trunk/gui/app.c
==============================================================================
--- trunk/gui/app.c	Mon Feb 28 14:42:39 2011	(r32986)
+++ trunk/gui/app.c	Mon Feb 28 15:47:17 2011	(r32987)
@@ -23,10 +23,6 @@
 
 listItems appMPlayer;
 
-char *skinDirInHome  = NULL;
-char *skinMPlayerDir = NULL;
-char *skinName       = NULL;
-
 static const evName evNames[] = {
     { evNone,              "evNone"              },
     { evPlay,              "evPlay"              },

Modified: trunk/gui/app.h
==============================================================================
--- trunk/gui/app.h	Mon Feb 28 14:42:39 2011	(r32986)
+++ trunk/gui/app.h	Mon Feb 28 15:47:17 2011	(r32987)
@@ -187,9 +187,6 @@ typedef struct {
 
 extern listItems appMPlayer;
 
-extern char *skinDirInHome;
-extern char *skinMPlayerDir;
-
 int appFindMessage(unsigned char *);
 void appInitStruct(listItems *);
 void btnModify(int, float);

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Mon Feb 28 14:42:39 2011	(r32986)
+++ trunk/gui/interface.c	Mon Feb 28 15:47:17 2011	(r32987)
@@ -76,6 +76,10 @@ int vcd_seek_to_track(void *vcd, int tra
 guiInterface_t guiIntfStruct;
 int guiWinID=-1;
 
+char *skinName;
+char *skinDirInHome;
+char *skinMPlayerDir;
+
 int gstrcmp( const char * a,const char * b )
 {
  if ( !a && !b ) return 0;

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	Mon Feb 28 14:42:39 2011	(r32986)
+++ trunk/gui/interface.h	Mon Feb 28 15:47:17 2011	(r32987)
@@ -185,6 +185,9 @@ typedef struct urlItem
 } URLItem;
 
 extern char   * skinName;
+extern char   * skinDirInHome;
+extern char   * skinMPlayerDir;
+
 extern plItem * plList;
 extern plItem * plCurrent;
 extern plItem * plLastPlayed;