diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-08-26 21:04:40 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-08-26 21:04:40 +0000 |
| commit | 31f370fe310c7c36b8288a34db480ca9d220f604 (patch) | |
| tree | 527faf54d2c242da307fbf146348c5df9d62bcb4 /Gui/app.c | |
| parent | 49809933c1fe343b6872cb570ef5d9c52606e3a6 (diff) | |
| download | mpv-31f370fe310c7c36b8288a34db480ca9d220f604.tar.bz2 mpv-31f370fe310c7c36b8288a34db480ca9d220f604.tar.xz | |
misc fixes/cleanup, Skin path stuff fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1708 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/app.c')
| -rw-r--r-- | Gui/app.c | 25 |
1 files changed, 15 insertions, 10 deletions
@@ -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 |