Mercurial > mplayer.hg
changeset 36043:40c13df3d953
Cosmetic: Rename variables (consistently).
| author | ib |
|---|---|
| date | Wed, 03 Apr 2013 16:09:58 +0000 |
| parents | 134919b73b04 |
| children | 7898b9b8ac51 |
| files | gui/dialog/dialog.c gui/dialog/skinbrowser.c gui/dialog/skinbrowser.h gui/interface.c gui/skin/skin.c gui/skin/skin.h |
| diffstat | 6 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/dialog/dialog.c Wed Apr 03 11:52:42 2013 +0000 +++ b/gui/dialog/dialog.c Wed Apr 03 16:09:58 2013 +0000 @@ -262,8 +262,8 @@ 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);
--- a/gui/dialog/skinbrowser.c Wed Apr 03 11:52:42 2013 +0000 +++ b/gui/dialog/skinbrowser.c Wed Apr 03 16:09:58 2013 +0000 @@ -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 @@ 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 );
--- a/gui/dialog/skinbrowser.h Wed Apr 03 11:52:42 2013 +0000 +++ b/gui/dialog/skinbrowser.h Wed Apr 03 16:09:58 2013 +0000 @@ -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 );
--- a/gui/interface.c Wed Apr 03 11:52:42 2013 +0000 +++ b/gui/interface.c Wed Apr 03 16:09:58 2013 +0000 @@ -116,11 +116,11 @@ /* 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");
--- a/gui/skin/skin.c Wed Apr 03 11:52:42 2013 +0000 +++ b/gui/skin/skin.c Wed Apr 03 16:09:58 2013 +0000 @@ -44,7 +44,7 @@ } _item; char *skinDirInHome; -char *skinMPlayerDir; +char *skinDirInData; static guiItems *skin; @@ -1050,7 +1050,7 @@ 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);
--- a/gui/skin/skin.h Wed Apr 03 11:52:42 2013 +0000 +++ b/gui/skin/skin.h Wed Apr 03 16:09:58 2013 +0000 @@ -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);