diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-23 01:41:45 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-23 01:41:45 +0000 |
commit | a1c02f562c534f9e9ff099fc084d45358b4a3106 (patch) | |
tree | 94b79007b366b5af7853d7c26a35a071ddc383aa /Gui/mplayer | |
parent | 590886a8f411a65d0be0b9d87b7e1bb26f8c1485 (diff) | |
download | mpv-a1c02f562c534f9e9ff099fc084d45358b4a3106.tar.bz2 mpv-a1c02f562c534f9e9ff099fc084d45358b4a3106.tar.xz |
bug fixs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3081 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/mplayer')
-rw-r--r-- | Gui/mplayer/mplayer.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Gui/mplayer/mplayer.c b/Gui/mplayer/mplayer.c index 134fa8851b..48dcef6981 100644 --- a/Gui/mplayer/mplayer.c +++ b/Gui/mplayer/mplayer.c @@ -74,9 +74,12 @@ void mplInit( int argc,char* argv[], char *envp[], void* disp ) wsCreateWindow( &appMPlayer.subWindow, appMPlayer.sub.x,appMPlayer.sub.y,appMPlayer.sub.width,appMPlayer.sub.height, - wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsShowFrame|wsShowWindow,"ViDEO" ); + wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsShowFrame|wsHideWindow,"ViDEO" ); - vo_setwindow(appMPlayer.subWindow.WindowID, appMPlayer.subWindow.wGC); + wsDestroyImage( &appMPlayer.subWindow ); + wsCreateImage( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Width,appMPlayer.sub.Bitmap.Height ); + + vo_setwindow( appMPlayer.subWindow.WindowID, appMPlayer.subWindow.wGC ); vo_setwindowsize( appMPlayer.sub.width,appMPlayer.sub.height ); i=wsHideFrame|wsMaxSize|wsHideWindow; @@ -86,7 +89,6 @@ void mplInit( int argc,char* argv[], char *envp[], void* disp ) wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,i,"MPlayer" ); //wsMinSize| wsSetShape( &appMPlayer.mainWindow,appMPlayer.main.Mask.Image ); - wsVisibleWindow( &appMPlayer.mainWindow,wsShowWindow ); mplMenuInit(); @@ -106,6 +108,7 @@ void mplInit( int argc,char* argv[], char *envp[], void* disp ) appMPlayer.subWindow.ReSize=mplResize; wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB ); + wsClearWindow( appMPlayer.subWindow ); if ( appMPlayer.sub.Bitmap.Image ) wsConvert( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Image,appMPlayer.sub.Bitmap.ImageSize ); wsPostRedisplay( &appMPlayer.mainWindow ); @@ -116,12 +119,9 @@ void mplInit( int argc,char* argv[], char *envp[], void* disp ) btnModify( evSetMoviePosition,mplShMem->Position ); mplShMem->Playing=0; - -// timerSetHandler( mplTimerHandler ); // various timer hacks -// timerInit(); - -// wsMainLoop(); // X event handler (calls mplTimerHandler periodically!) + wsVisibleWindow( &appMPlayer.mainWindow,wsShowWindow ); + wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow ); } void mplDone(){ |