diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-28 11:55:17 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-28 11:55:17 +0000 |
commit | d2a4ecd87009f2c301382847a9c7785467af6938 (patch) | |
tree | 9030304d76f00ea7423edadb2412fe17bad34383 /Gui/mplayer | |
parent | 2eee0cefb01b149c86d2ca58df69c3f29c3af971 (diff) | |
download | mpv-d2a4ecd87009f2c301382847a9c7785467af6938.tar.bz2 mpv-d2a4ecd87009f2c301382847a9c7785467af6938.tar.xz |
fix text render chrash ...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6219 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/mplayer')
-rw-r--r-- | Gui/mplayer/mplayer.c | 8 | ||||
-rw-r--r-- | Gui/mplayer/mplayer.h | 2 | ||||
-rw-r--r-- | Gui/mplayer/mw.h | 22 | ||||
-rw-r--r-- | Gui/mplayer/play.c | 2 | ||||
-rw-r--r-- | Gui/mplayer/play.h | 2 | ||||
-rw-r--r-- | Gui/mplayer/widgets.c | 7 | ||||
-rw-r--r-- | Gui/mplayer/widgets.h | 2 |
7 files changed, 16 insertions, 29 deletions
diff --git a/Gui/mplayer/mplayer.c b/Gui/mplayer/mplayer.c index 64ef18bca9..e1133dffc6 100644 --- a/Gui/mplayer/mplayer.c +++ b/Gui/mplayer/mplayer.c @@ -42,18 +42,18 @@ void mplTimerHandler( void ) 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 ) { diff --git a/Gui/mplayer/mplayer.h b/Gui/mplayer/mplayer.h index 718895e8ed..23465bd24a 100644 --- a/Gui/mplayer/mplayer.h +++ b/Gui/mplayer/mplayer.h @@ -12,7 +12,7 @@ extern int mainVisible; 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 ); diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h index 0b51c2a408..4f0263e875 100644 --- a/Gui/mplayer/mw.h +++ b/Gui/mplayer/mw.h @@ -196,8 +196,6 @@ drawrenderedtext: // 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 @@ NoPause: 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 @@ NoPause: 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 } } diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c index be8c2205ad..bdeefd5a98 100644 --- a/Gui/mplayer/play.c +++ b/Gui/mplayer/play.c @@ -138,7 +138,7 @@ void mplState( void ) } } -void mplMPlayerInit( int argc,char* argv[], char *envp[] ) +void mplMPlayerInit( void ) { guiIntfStruct.Balance=50.0f; guiIntfStruct.StreamType=-1; diff --git a/Gui/mplayer/play.h b/Gui/mplayer/play.h index 3fa45a80e0..e5c8ebf3f1 100644 --- a/Gui/mplayer/play.h +++ b/Gui/mplayer/play.h @@ -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 ); diff --git a/Gui/mplayer/widgets.c b/Gui/mplayer/widgets.c index 75ff8c4ed8..c2930978e2 100644 --- a/Gui/mplayer/widgets.c +++ b/Gui/mplayer/widgets.c @@ -48,11 +48,14 @@ int gtkInited = 0; // --- 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; diff --git a/Gui/mplayer/widgets.h b/Gui/mplayer/widgets.h index 205e089ffb..e774426d00 100644 --- a/Gui/mplayer/widgets.h +++ b/Gui/mplayer/widgets.h @@ -37,7 +37,7 @@ extern char * sbMPlayerPrefixDir; 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 ); |