Mercurial > mplayer.hg

changeset 32900:1481268ccd30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author ib
date Mon, 28 Feb 2011 14:47:17 +0000
parents 7104e2b2b648
children d5c110e49682
files gui/app.c gui/app.h gui/interface.c gui/interface.h
diffstat 4 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/gui/app.c	Mon Feb 28 13:42:39 2011 +0000
+++ b/gui/app.c	Mon Feb 28 14:47:17 2011 +0000
@@ -23,10 +23,6 @@
 
 listItems appMPlayer;
 
-char *skinDirInHome  = NULL;
-char *skinMPlayerDir = NULL;
-char *skinName       = NULL;
-
 static const evName evNames[] = {
     { evNone,              "evNone"              },
     { evPlay,              "evPlay"              },
--- a/gui/app.h	Mon Feb 28 13:42:39 2011 +0000
+++ b/gui/app.h	Mon Feb 28 14:47:17 2011 +0000
@@ -187,9 +187,6 @@
 
 extern listItems appMPlayer;
 
-extern char *skinDirInHome;
-extern char *skinMPlayerDir;
-
 int appFindMessage(unsigned char *);
 void appInitStruct(listItems *);
 void btnModify(int, float);
--- a/gui/interface.c	Mon Feb 28 13:42:39 2011 +0000
+++ b/gui/interface.c	Mon Feb 28 14:47:17 2011 +0000
@@ -76,6 +76,10 @@
 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;
--- a/gui/interface.h	Mon Feb 28 13:42:39 2011 +0000
+++ b/gui/interface.h	Mon Feb 28 14:47:17 2011 +0000
@@ -185,6 +185,9 @@
 } URLItem;
 
 extern char   * skinName;
+extern char   * skinDirInHome;
+extern char   * skinMPlayerDir;
+
 extern plItem * plList;
 extern plItem * plCurrent;
 extern plItem * plLastPlayed;