[Mplayer-cvslog] CVS: main/Gui app.c,1.3,1.4 app.h,1.1,1.2

[Arpi of Ize]

Update of /cvsroot/mplayer/main/Gui
In directory mplayer:/var/tmp.root/cvs-serv18537

Modified Files:
	app.c app.h 
Log Message:
misc fixes/cleanup, Skin path stuff fixed

Index: app.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/app.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- app.c	25 Aug 2001 23:00:55 -0000	1.3
+++ app.c	26 Aug 2001 21:04:40 -0000	1.4
@@ -15,8 +15,8 @@
 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 @@
 
 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
 

Index: app.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/app.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- app.h	25 Aug 2001 21:04:26 -0000	1.1
+++ app.h	26 Aug 2001 21:04:40 -0000	1.2
@@ -74,8 +74,8 @@
 extern listItems   appTV;
 extern listItems   appRadio;
 
-extern char      * appMPlayerDirInHome;
-extern char      * appMPlayerDir;
+//extern char      * appMPlayerDirInHome;
+//extern char      * appMPlayerDir;
 extern char      * skinDirInHome;
 extern char      * skinMPlayerDir;