[Mplayer-cvslog] CVS: main/Gui app.c,1.12,1.13 app.h,1.7,1.8 interface.c,1.15,1.16 interface.h,1.9,1.10

[Zoltan Ponekker]

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

Modified Files:
	app.c app.h interface.c interface.h 
Log Message:
fix text render chrash ...

Index: app.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/app.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- app.c	17 Apr 2002 21:12:11 -0000	1.12
+++ app.c	28 May 2002 11:55:15 -0000	1.13
@@ -97,21 +97,17 @@
  return -1;
 }
 
-void appInit( int argc,char* argv[], char *envp[], void* disp )
+void appInit( void * disp )
 {
  skinDirInHome=get_path("Skin");
  skinMPlayerDir=DATADIR "/Skin";
  printf("SKIN dir 1: '%s'\n",skinDirInHome);
  printf("SKIN dir 2: '%s'\n",skinMPlayerDir);
- if ( !skinName )
-  {
-   if ( ( skinName=(char *)calloc( 1,7 ) ) == NULL ) { mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[config] Not enough memory.\n" ); exit( 1 ); }
-   strcpy( skinName,"default" );
-  }
+ if ( !skinName ) skinName=strdup( "default" );
  switch ( skinRead( skinName ) )
   {
    case -1: mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_SKIN_SKINCFG_SkinNotFound,skinName ); exit( 0 );
    case -2: mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_SKIN_SKINCFG_SkinCfgReadError,skinName ); exit( 0 );
   }
- mplInit( argc,argv,envp,disp ); // does gtk & ws initialization, create windows
+ mplInit( disp ); // does gtk & ws initialization, create windows
 }

Index: app.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/app.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- app.h	17 Apr 2002 21:12:11 -0000	1.7
+++ app.h	28 May 2002 11:55:15 -0000	1.8
@@ -77,7 +77,7 @@
 extern char      * skinMPlayerDir;
 extern char      * skinName;
 
-extern void appInit( int argc,char* argv[], char *envp[], void* disp );
+extern void appInit( void * disp );
 extern void appInitStruct( listItems * item );
 extern void appClearItem( wItem * item );
 extern void appCopy( listItems * item1,listItems * item2 );

Index: interface.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- interface.c	6 May 2002 15:05:05 -0000	1.15
+++ interface.c	28 May 2002 11:55:15 -0000	1.16
@@ -21,10 +21,10 @@
 
 guiInterface_t guiIntfStruct;
 
-void guiInit( int argc,char* argv[], char *envp[] )
+void guiInit( void )
 {
  memset( &guiIntfStruct,0,sizeof( guiIntfStruct ) );
- appInit( argc,argv,envp,(void*)mDisplay );
+ appInit( (void*)mDisplay );
 }
 
 void guiDone( void )

Index: interface.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- interface.h	22 Apr 2002 21:36:12 -0000	1.9
+++ interface.h	28 May 2002 11:55:15 -0000	1.10
@@ -110,7 +110,7 @@
 
 extern char *get_path(char *filename); 
 
-extern void guiInit( int argc,char* argv[], char *envp[] );
+extern void guiInit( void );
 extern void guiDone( void );
 extern void guiGetEvent( int type,char * arg );
 extern void guiEventHandling( void );