Mercurial > mplayer.hg
changeset 32847:12ae3b893c59
Remove support for skins directories using the obsolete name 'Skin'.
| author | ib |
|---|---|
| date | Sat, 19 Feb 2011 22:02:34 +0000 |
| parents | 7e40682bf120 |
| children | 926c1892c98d |
| files | DOCS/tech/TODO gui/app.c gui/app.h gui/interface.c gui/mplayer/gtk/sb.c gui/mplayer/widgets.c gui/mplayer/widgets.h gui/skin/skin.c |
| diffstat | 8 files changed, 1 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/DOCS/tech/TODO Sat Feb 19 16:22:20 2011 +0000 +++ b/DOCS/tech/TODO Sat Feb 19 22:02:34 2011 +0000 @@ -39,9 +39,6 @@ FOR THE v1.00 RELEASE: ~~~~~~~~~~~~~~~~~~~~~~ -cruft removal: -- remove support for skins directories using the obsolete name 'Skin' - DVB: - display OSD and subtitles using DVB card's OSD
--- a/gui/app.c Sat Feb 19 16:22:20 2011 +0000 +++ b/gui/app.c Sat Feb 19 22:02:34 2011 +0000 @@ -88,11 +88,8 @@ listItems appMPlayer; -/* FIXME: Eventually remove the obsolete directory names. */ char * skinDirInHome=NULL; -char * skinDirInHome_obsolete=NULL; char * skinMPlayerDir=NULL; -char * skinMPlayerDir_obsolete=NULL; char * skinName = NULL; void appClearItem( wItem * item )
--- a/gui/app.h Sat Feb 19 16:22:20 2011 +0000 +++ b/gui/app.h Sat Feb 19 22:02:34 2011 +0000 @@ -190,9 +190,7 @@ extern listItems appMPlayer; extern char * skinDirInHome; -extern char * skinDirInHome_obsolete; extern char * skinMPlayerDir; -extern char * skinMPlayerDir_obsolete; void appInitStruct( listItems * item ); void appClearItem( wItem * item );
--- a/gui/interface.c Sat Feb 19 16:22:20 2011 +0000 +++ b/gui/interface.c Sat Feb 19 22:02:34 2011 +0000 @@ -179,13 +179,9 @@ wsXInit( (void *)mDisplay ); // --- load skin skinDirInHome=get_path("skins"); - skinDirInHome_obsolete=get_path("Skin"); skinMPlayerDir=MPLAYER_DATADIR "/skins"; - skinMPlayerDir_obsolete=MPLAYER_DATADIR "/Skin"; mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 1: '%s'\n",skinDirInHome); - mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 1 (obsolete): '%s'\n",skinDirInHome_obsolete); mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 2: '%s'\n",skinMPlayerDir); - mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 2 (obsolete): '%s'\n",skinMPlayerDir_obsolete); if ( !skinName ) skinName=strdup( "default" ); i = skinRead( skinName ); if ((i == -1) && strcmp(skinName,"default"))
--- a/gui/mplayer/gtk/sb.c Sat Feb 19 16:22:20 2011 +0000 +++ b/gui/mplayer/gtk/sb.c Sat Feb 19 22:02:34 2011 +0000 @@ -34,11 +34,8 @@ GtkWidget * SkinList = NULL; char * sbSelectedSkin=NULL; -/* FIXME: Eventually remove the obsolete directory names. */ char * sbMPlayerDirInHome=NULL; -char * sbMPlayerDirInHome_obsolete=NULL; char * sbMPlayerPrefixDir=NULL; -char * sbMPlayerPrefixDir_obsolete=NULL; char * gtkOldSkin=NULL; static char * prev=NULL; @@ -195,12 +192,8 @@ 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_obsolete=calloc( 1,strlen( skinDirInHome_obsolete ) + 4 ) ) != NULL ) - { strcpy( sbMPlayerDirInHome_obsolete,skinDirInHome_obsolete ); strcat( sbMPlayerDirInHome_obsolete,"/*" ); } if ( ( sbMPlayerDirInHome=calloc( 1,strlen( skinDirInHome ) + 4 ) ) != NULL ) { strcpy( sbMPlayerDirInHome,skinDirInHome ); strcat( sbMPlayerDirInHome,"/*" ); } - if ( ( sbMPlayerPrefixDir_obsolete=calloc( 1,strlen( skinMPlayerDir ) + 4 ) ) != NULL ) - { strcpy( sbMPlayerPrefixDir_obsolete,skinMPlayerDir ); strcat( sbMPlayerPrefixDir_obsolete,"/*" ); } if ( ( sbMPlayerPrefixDir=calloc( 1,strlen( skinMPlayerDir ) + 4 ) ) != NULL ) { strcpy( sbMPlayerPrefixDir,skinMPlayerDir ); strcat( sbMPlayerPrefixDir,"/*" ); }
--- a/gui/mplayer/widgets.c Sat Feb 19 16:22:20 2011 +0000 +++ b/gui/mplayer/widgets.c Sat Feb 19 22:02:34 2011 +0000 @@ -185,9 +185,7 @@ ShowSkinBrowser(); // gtkClearList( SkinList ); if ( gtkFillSkinList( sbMPlayerPrefixDir ) && - gtkFillSkinList( sbMPlayerPrefixDir_obsolete ) && - gtkFillSkinList( sbMPlayerDirInHome ) && - gtkFillSkinList( sbMPlayerDirInHome_obsolete ) ) + gtkFillSkinList( sbMPlayerDirInHome ) ) { gtkSetDefaultToCList( SkinList,param ); gtk_clist_sort( GTK_CLIST( SkinList ) );
--- a/gui/mplayer/widgets.h Sat Feb 19 16:22:20 2011 +0000 +++ b/gui/mplayer/widgets.h Sat Feb 19 22:02:34 2011 +0000 @@ -52,8 +52,6 @@ extern char * sbMPlayerDirInHome; extern char * sbMPlayerPrefixDir; -extern char * sbMPlayerDirInHome_obsolete; -extern char * sbMPlayerPrefixDir_obsolete; extern GdkPixmap * gtkIcon; extern GdkBitmap * gtkIconMask;
--- a/gui/skin/skin.c Sat Feb 19 16:22:20 2011 +0000 +++ b/gui/skin/skin.c Sat Feb 19 22:02:34 2011 +0000 @@ -678,17 +678,9 @@ setname( skinMPlayerDir,dname ); if ( ( skinFile = fopen( fn,"rt" ) ) == NULL ) { - setname( skinDirInHome_obsolete,dname ); - if ( ( skinFile = fopen( fn,"rt" ) ) == NULL ) - { - setname( skinMPlayerDir_obsolete,dname ); - if ( ( skinFile = fopen( fn,"rt" ) ) == NULL ) - { setname( skinMPlayerDir,dname ); mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_SKIN_SkinFileNotFound,fn ); return -1; - } - } } }