[MPlayer-cvslog] r36137 - in trunk/gui: dialog/dialog.c dialog/skinbrowser.c dialog/skinbrowser.h interface.c skin/skin.c skin/skin.h

[ib]

Author: ib
Date: Wed Apr  3 18:09:58 2013
New Revision: 36137

Log:
Cosmetic: Rename variables (consistently).

Modified:
   trunk/gui/dialog/dialog.c
   trunk/gui/dialog/skinbrowser.c
   trunk/gui/dialog/skinbrowser.h
   trunk/gui/interface.c
   trunk/gui/skin/skin.c
   trunk/gui/skin/skin.h

Modified: trunk/gui/dialog/dialog.c
==============================================================================
--- trunk/gui/dialog/dialog.c	Wed Apr  3 13:52:42 2013	(r36136)
+++ trunk/gui/dialog/dialog.c	Wed Apr  3 18:09:58 2013	(r36137)
@@ -262,8 +262,8 @@ void gtkShow(int type, char *param)
         ShowSkinBrowser();
 
 //        gtk_clist_clear(GTK_CLIST(SkinList));
-        if (FillSkinList(sbMPlayerPrefixDir) &&
-            FillSkinList(sbMPlayerDirInHome)) {
+        if (FillSkinList(sbSkinDirInData) &&
+            FillSkinList(sbSkinDirInHome)) {
             gtkSelectInCList(SkinList, param);
             gtk_clist_sort(GTK_CLIST(SkinList));
             gtk_widget_show(SkinBrowser);

Modified: trunk/gui/dialog/skinbrowser.c
==============================================================================
--- trunk/gui/dialog/skinbrowser.c	Wed Apr  3 13:52:42 2013	(r36136)
+++ trunk/gui/dialog/skinbrowser.c	Wed Apr  3 18:09:58 2013	(r36137)
@@ -37,8 +37,8 @@
 
 GtkWidget * SkinList = NULL;
 char      * sbSelectedSkin=NULL;
-char      * sbMPlayerDirInHome=NULL;
-char      * sbMPlayerPrefixDir=NULL;
+char      * sbSkinDirInHome=NULL;
+char      * sbSkinDirInData=NULL;
 
 char * gtkOldSkin=NULL;
 static char * prev=NULL;
@@ -154,10 +154,10 @@ static GtkWidget * CreateSkinBrowser( vo
  gtk_signal_connect( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( prButton ),(void *)1 );
  gtk_signal_connect( GTK_OBJECT( Cancel ),"clicked",GTK_SIGNAL_FUNC( prButton ),(void *)0 );
 
- if ( ( sbMPlayerDirInHome=calloc( 1,strlen( skinDirInHome ) + 4 ) ) != NULL )
-  { strcpy( sbMPlayerDirInHome,skinDirInHome ); strcat( sbMPlayerDirInHome,"/*" ); }
- if ( ( sbMPlayerPrefixDir=calloc( 1,strlen( skinMPlayerDir ) + 4 ) ) != NULL )
-  { strcpy( sbMPlayerPrefixDir,skinMPlayerDir ); strcat( sbMPlayerPrefixDir,"/*" ); }
+ if ( ( sbSkinDirInHome=calloc( 1,strlen( skinDirInHome ) + 4 ) ) != NULL )
+  { strcpy( sbSkinDirInHome,skinDirInHome ); strcat( sbSkinDirInHome,"/*" ); }
+ if ( ( sbSkinDirInData=calloc( 1,strlen( skinDirInData ) + 4 ) ) != NULL )
+  { strcpy( sbSkinDirInData,skinDirInData ); strcat( sbSkinDirInData,"/*" ); }
 
  gtk_window_add_accel_group( GTK_WINDOW( SkinBrowser ),accel_group );
  gtk_widget_grab_focus( SkinList );

Modified: trunk/gui/dialog/skinbrowser.h
==============================================================================
--- trunk/gui/dialog/skinbrowser.h	Wed Apr  3 13:52:42 2013	(r36136)
+++ trunk/gui/dialog/skinbrowser.h	Wed Apr  3 18:09:58 2013	(r36137)
@@ -24,8 +24,8 @@
 extern char      * sbSelectedSkin;
 extern GtkWidget * SkinBrowser;
 extern GtkWidget *SkinList;
-extern char *sbMPlayerDirInHome;
-extern char *sbMPlayerPrefixDir;
+extern char *sbSkinDirInHome;
+extern char *sbSkinDirInData;
 
 int FillSkinList(gchar *dir);
 void ShowSkinBrowser( void );

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Wed Apr  3 13:52:42 2013	(r36136)
+++ trunk/gui/interface.c	Wed Apr  3 18:09:58 2013	(r36137)
@@ -116,11 +116,11 @@ void guiInit(void)
 
     /* load skin */
 
-    skinDirInHome  = get_path("skins");
-    skinMPlayerDir = MPLAYER_DATADIR "/skins";
+    skinDirInHome = get_path("skins");
+    skinDirInData = MPLAYER_DATADIR "/skins";
 
     mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] skin directory #1: %s\n", skinDirInHome);
-    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] skin directory #2: %s\n", skinMPlayerDir);
+    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] skin directory #2: %s\n", skinDirInData);
 
     if (!skinName)
         skinName = strdup("default");

Modified: trunk/gui/skin/skin.c
==============================================================================
--- trunk/gui/skin/skin.c	Wed Apr  3 13:52:42 2013	(r36136)
+++ trunk/gui/skin/skin.c	Wed Apr  3 18:09:58 2013	(r36137)
@@ -44,7 +44,7 @@ typedef struct {
 } _item;
 
 char *skinDirInHome;
-char *skinMPlayerDir;
+char *skinDirInData;
 
 static guiItems *skin;
 
@@ -1050,7 +1050,7 @@ int skinRead(char *sname)
     skinfname = setname(skinDirInHome, sname);
 
     if ((skinfile = fopen(skinfname, "rt")) == NULL) {
-        skinfname = setname(skinMPlayerDir, sname);
+        skinfname = setname(skinDirInData, sname);
 
         if ((skinfile = fopen(skinfname, "rt")) == NULL) {
             mp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_SKIN_SkinFileNotFound, skinfname);

Modified: trunk/gui/skin/skin.h
==============================================================================
--- trunk/gui/skin/skin.h	Wed Apr  3 13:52:42 2013	(r36136)
+++ trunk/gui/skin/skin.h	Wed Apr  3 18:09:58 2013	(r36137)
@@ -22,7 +22,7 @@
 #include "gui/util/bitmap.h"
 
 extern char *skinDirInHome;
-extern char *skinMPlayerDir;
+extern char *skinDirInData;
 
 int skinImageRead(char *fname, guiImage *img);
 int skinRead(char *dname);