[MPlayer-cvslog] r32934 - in trunk: 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
ib
subversion at mplayerhq.hu
Sat Feb 19 23:02:35 CET 2011
Author: ib
Date: Sat Feb 19 23:02:34 2011
New Revision: 32934
Log:
Remove support for skins directories using the obsolete name 'Skin'.
Modified:
trunk/DOCS/tech/TODO
trunk/gui/app.c
trunk/gui/app.h
trunk/gui/interface.c
trunk/gui/mplayer/gtk/sb.c
trunk/gui/mplayer/widgets.c
trunk/gui/mplayer/widgets.h
trunk/gui/skin/skin.c
Modified: trunk/DOCS/tech/TODO
==============================================================================
--- trunk/DOCS/tech/TODO Sat Feb 19 17:22:20 2011 (r32933)
+++ trunk/DOCS/tech/TODO Sat Feb 19 23:02:34 2011 (r32934)
@@ -39,9 +39,6 @@ FOR THE NEXT RELEASE:
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
Modified: trunk/gui/app.c
==============================================================================
--- trunk/gui/app.c Sat Feb 19 17:22:20 2011 (r32933)
+++ trunk/gui/app.c Sat Feb 19 23:02:34 2011 (r32934)
@@ -88,11 +88,8 @@ static const int evBoxs = sizeof( evName
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 )
Modified: trunk/gui/app.h
==============================================================================
--- trunk/gui/app.h Sat Feb 19 17:22:20 2011 (r32933)
+++ trunk/gui/app.h Sat Feb 19 23:02:34 2011 (r32934)
@@ -190,9 +190,7 @@ typedef struct
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 );
Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c Sat Feb 19 17:22:20 2011 (r32933)
+++ trunk/gui/interface.c Sat Feb 19 23:02:34 2011 (r32934)
@@ -179,13 +179,9 @@ void guiInit( void )
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"))
Modified: trunk/gui/mplayer/gtk/sb.c
==============================================================================
--- trunk/gui/mplayer/gtk/sb.c Sat Feb 19 17:22:20 2011 (r32933)
+++ trunk/gui/mplayer/gtk/sb.c Sat Feb 19 23:02:34 2011 (r32934)
@@ -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 @@ GtkWidget * create_SkinBrowser( void )
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,"/*" ); }
Modified: trunk/gui/mplayer/widgets.c
==============================================================================
--- trunk/gui/mplayer/widgets.c Sat Feb 19 17:22:20 2011 (r32933)
+++ trunk/gui/mplayer/widgets.c Sat Feb 19 23:02:34 2011 (r32934)
@@ -185,9 +185,7 @@ void gtkShow( int type,char * param )
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 ) );
Modified: trunk/gui/mplayer/widgets.h
==============================================================================
--- trunk/gui/mplayer/widgets.h Sat Feb 19 17:22:20 2011 (r32933)
+++ trunk/gui/mplayer/widgets.h Sat Feb 19 23:02:34 2011 (r32934)
@@ -52,8 +52,6 @@ extern int gtkPopupMenuParam
extern char * sbMPlayerDirInHome;
extern char * sbMPlayerPrefixDir;
-extern char * sbMPlayerDirInHome_obsolete;
-extern char * sbMPlayerPrefixDir_obsolete;
extern GdkPixmap * gtkIcon;
extern GdkBitmap * gtkIconMask;
Modified: trunk/gui/skin/skin.c
==============================================================================
--- trunk/gui/skin/skin.c Sat Feb 19 17:22:20 2011 (r32933)
+++ trunk/gui/skin/skin.c Sat Feb 19 23:02:34 2011 (r32934)
@@ -678,17 +678,9 @@ int skinRead( char * dname )
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;
- }
- }
}
}
More information about the MPlayer-cvslog
mailing list