From 31f370fe310c7c36b8288a34db480ca9d220f604 Mon Sep 17 00:00:00 2001 From: arpi Date: Sun, 26 Aug 2001 21:04:40 +0000 Subject: misc fixes/cleanup, Skin path stuff fixed git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1708 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Gui/app.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'Gui/app.c') diff --git a/Gui/app.c b/Gui/app.c index 594cef7ea5..023882ee19 100644 --- a/Gui/app.c +++ b/Gui/app.c @@ -15,8 +15,8 @@ listItems appMPlayer; listItems appTV; listItems appRadio; -char * appMPlayerDirInHome=NULL; -char * appMPlayerDir=NULL; +//char * appMPlayerDirInHome=NULL; +//char * appMPlayerDir=NULL; char * skinDirInHome=NULL; char * skinMPlayerDir=NULL; @@ -98,14 +98,19 @@ int appFindMessage( unsigned char * str ) void appInit( int argc,char* argv[], char *envp[] ) { - if ( ( appMPlayerDirInHome=(char *)calloc( 1,strlen( getenv( "HOME" ) ) + 9 ) ) != NULL ) - { strcpy( appMPlayerDirInHome,getenv( "HOME" ) ); strcat( appMPlayerDirInHome,"/.mplayer" ); } - if ( ( skinDirInHome=(char *)calloc( 1,strlen( appMPlayerDirInHome ) + 5 ) ) != NULL ) - { strcpy( skinDirInHome,appMPlayerDirInHome ); strcat( skinDirInHome,"/Skin" ); } - if ( ( appMPlayerDir=(char *)calloc( 1,strlen( PREFIX ) + 14 ) ) != NULL ) - { strcpy( appMPlayerDir,PREFIX ); strcat( appMPlayerDir,"/share/mplayer" ); } - if ( ( skinMPlayerDir=(char *)calloc( 1,strlen( appMPlayerDir ) + 5 ) ) != NULL ) - { strcpy( skinMPlayerDir,appMPlayerDir ); strcat( skinMPlayerDir,"/Skin" ); } + skinDirInHome=get_path("Skin"); + skinMPlayerDir=DATADIR "/Skin"; + printf("SKIN dir 1: '%s'\n",skinDirInHome); + printf("SKIN dir 2: '%s'\n",skinMPlayerDir); + +// if ( ( appMPlayerDirInHome=(char *)calloc( 1,strlen( getenv( "HOME" ) ) + 9 ) ) != NULL ) +// { strcpy( appMPlayerDirInHome,getenv( "HOME" ) ); strcat( appMPlayerDirInHome,"/.mplayer" ); } +// if ( ( skinDirInHome=(char *)calloc( 1,strlen( appMPlayerDirInHome ) + 5 ) ) != NULL ) +// { strcpy( skinDirInHome,appMPlayerDirInHome ); strcat( skinDirInHome,"/Skin" ); } +// if ( ( appMPlayerDir=(char *)calloc( 1,strlen( PREFIX ) + 14 ) ) != NULL ) +// { strcpy( appMPlayerDir,PREFIX ); strcat( appMPlayerDir,"/share/mplayer" ); } +// if ( ( skinMPlayerDir=(char *)calloc( 1,strlen( appMPlayerDir ) + 5 ) ) != NULL ) +// { strcpy( skinMPlayerDir,appMPlayerDir ); strcat( skinMPlayerDir,"/Skin" ); } initDebug(NULL); // write messages to stderr -- cgit v1.2.3