[Mplayer-cvslog] CVS: main/Gui/mplayer mplayer.c,1.23,1.24 mplayer.h,1.5,1.6 mw.h,1.60,1.61 play.c,1.62,1.63 play.h,1.23,1.24 widgets.c,1.23,1.24 widgets.h,1.13,1.14
Zoltan Ponekker
pontscho at mplayerhq.hu
Tue May 28 13:55:19 CEST 2002
Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mail:/var/tmp.root/cvs-serv4488/Gui/mplayer
Modified Files:
mplayer.c mplayer.h mw.h play.c play.h widgets.c widgets.h
Log Message:
fix text render chrash ...
Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mplayer.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mplayer.c 16 Apr 2002 17:41:29 -0000 1.23
+++ mplayer.c 28 May 2002 11:55:16 -0000 1.24
@@ -42,18 +42,18 @@
if ( mplRedrawTimer == 0 ) mplEventHandling( evRedraw,0 );
}
-void mplInit( int argc,char* argv[], char *envp[], void* disp )
+void mplInit( void * disp )
{
int i;
// init fields of this struct to default values
- mplMPlayerInit( argc,argv,envp );
+ mplMPlayerInit();
// fork() a process which runs gtkThreadProc() [gtkPID]
- gtkInit( argc,argv,envp );
+ gtkInit();
// opens X display, checks for extensions (XShape, DGA etc)
- wsXInit(disp);
+ wsXInit( disp );
if ( ( mplDrawBuffer = (unsigned char *)calloc( 1,appMPlayer.main.Bitmap.ImageSize ) ) == NULL )
{
Index: mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mplayer.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mplayer.h 23 Feb 2002 15:12:53 -0000 1.5
+++ mplayer.h 28 May 2002 11:55:16 -0000 1.6
@@ -12,7 +12,7 @@
extern int mplMainAutoPlay;
extern int mplMiddleMenu;
-extern void mplInit( int argc,char* argv[], char *envp[], void* disp );
+extern void mplInit( void * disp );
extern void mplEventHandling( int msg,float param );
extern void mplTimerHandler( void );
Index: mw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- mw.h 25 May 2002 09:46:36 -0000 1.60
+++ mw.h 28 May 2002 11:55:16 -0000 1.61
@@ -196,8 +196,6 @@
// XFlush( wsDisplay );
}
-#define IZE(x) printf("@@@ " x " @@@\n");
-
extern void exit_player(char* how);
extern int audio_id;
extern int dvdsub_id;
@@ -307,30 +305,14 @@
break;
case evPlayList:
- IZE("evPlayList");
mplMainRender=1;
gtkShow( evPlayList,NULL );
-#warning disabled old gtk code
-#if 0
- if ( gtkVisiblePlayList )
- {
- btnModify( evPlayList,btnReleased );
- gtkShMem->vs.window=evPlayList;
- gtkSendMessage( evHideWindow );
- gtkVisiblePlayList=0;
- }
- else
- {
- gtkSendMessage( evPlayList );
- btnModify( evPlayList,btnPressed );
- gtkVisiblePlayList=1;
- }
-#endif
break;
case evSkinBrowser: gtkShow( evSkinBrowser,skinName ); break;
case evAbout: gtkShow( evAbout,NULL ); break;
case evPreferences: gtkShow( evPreferences,NULL ); break;
+ case evEqualeaser: gtkMessageBox( GTK_MB_WARNING,"Sorry, this feature not implemented ..." ); break;
case evForward1min: mplRelSeek( 60 ); break;
case evBackward1min: mplRelSeek( -60 ); break;
@@ -395,12 +377,14 @@
mplRedrawTimer=mplRedrawTimerConst;
break;
// --- system events
+#ifdef MP_DEBUG
case evNone:
mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[mw] event none received.\n" );
break;
default:
mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[mw] unknown event received ( %d,%.2f ).\n",msg,param );
break;
+#endif
}
}
Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- play.c 20 May 2002 13:56:15 -0000 1.62
+++ play.c 28 May 2002 11:55:16 -0000 1.63
@@ -138,7 +138,7 @@
}
}
-void mplMPlayerInit( int argc,char* argv[], char *envp[] )
+void mplMPlayerInit( void )
{
guiIntfStruct.Balance=50.0f;
guiIntfStruct.StreamType=-1;
Index: play.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- play.h 5 May 2002 18:46:42 -0000 1.23
+++ play.h 28 May 2002 11:55:16 -0000 1.24
@@ -6,7 +6,7 @@
#include "./mplayer.h"
-extern void mplMPlayerInit( int argc,char* argv[], char *envp[] );
+extern void mplMPlayerInit( void );
extern void mplStop();
extern void mplFullScreen( void );
Index: widgets.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/widgets.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- widgets.c 20 May 2002 13:56:15 -0000 1.23
+++ widgets.c 28 May 2002 11:55:16 -0000 1.24
@@ -48,11 +48,14 @@
// --- init & close gtk
-void gtkInit( int argc,char* argv[], char *envp[] )
+void gtkInit( void )
{
+ int largc = 1;
+ char * largv[1] = { "asd" };
mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[widget] init gtk ...\n" );
gtk_set_locale();
- gtk_init( &argc,&argv );
+// gtk_init( &argc,&argv );
+ gtk_init( 0,NULL );
// gdk_set_use_xshm( TRUE );
gtkInited=1;
Index: widgets.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/widgets.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- widgets.h 20 May 2002 13:56:15 -0000 1.13
+++ widgets.h 28 May 2002 11:55:16 -0000 1.14
@@ -37,7 +37,7 @@
extern void widgetsCreate( void );
-extern void gtkInit( int argc,char* argv[], char *envp[] );
+extern void gtkInit( void );
extern void gtkDone( void );
extern int gtkFillSkinList( gchar * dir );
More information about the MPlayer-cvslog
mailing list