Mercurial > mplayer.hg
diff Gui/mplayer/mplayer.c @ 1723:5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
author | arpi |
---|---|
date | Mon, 27 Aug 2001 23:56:44 +0000 |
parents | a4e0211455d8 |
children | 0880718750d5 |
line wrap: on
line diff
--- a/Gui/mplayer/mplayer.c Mon Aug 27 23:56:15 2001 +0000 +++ b/Gui/mplayer/mplayer.c Mon Aug 27 23:56:44 2001 +0000 @@ -48,7 +48,7 @@ if ( mplGeneralTimer == 0 ) mplMsgHandle( evGeneralTimer,0 ); } -void mplInit( int argc,char* argv[], char *envp[] ) +void mplInit( int argc,char* argv[], char *envp[], void* disp ) { // parse_cfgfiles( argc,argv,envp ); @@ -63,7 +63,7 @@ message=mplErrorHandler; // error messagebox drawing function // opens X display, checks for extensions (XShape, DGA etc) - wsXInit(); + wsXInit(disp); if ( ( mplDrawBuffer = (unsigned char *)calloc( 1,appMPlayer.main.Bitmap.ImageSize ) ) == NULL ) { @@ -75,6 +75,9 @@ appMPlayer.sub.x,appMPlayer.sub.y,appMPlayer.sub.width,appMPlayer.sub.height, wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsShowFrame|wsShowWindow,"ViDEO" ); + vo_setwindow(appMPlayer.subWindow.WindowID, appMPlayer.subWindow.wGC); + mplSubRender=0; + wsCreateWindow( &appMPlayer.mainWindow, appMPlayer.main.x,appMPlayer.main.y,appMPlayer.main.width,appMPlayer.main.height, wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsHideFrame|wsMaxSize|wsMinSize|wsShowWindow,"MPlayer" ); @@ -105,6 +108,8 @@ btnModify( evSetBalance,mplShMem->Balance ); btnModify( evSetMoviePosition,mplShMem->Position ); + mplShMem->Playing=0; + // timerSetHandler( mplTimerHandler ); // various timer hacks // timerInit();