diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-08-30 22:07:19 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-08-30 22:07:19 +0000 |
commit | 6835c60519bc8185a6b91988e0690f241a194fea (patch) | |
tree | 2b4dd10a3519d3a0ff48ecefff0f29a38b4fbb34 /Gui | |
parent | 5024b76c563a4dc1ecef1f0f700daa0d45e31ca9 (diff) | |
download | mpv-6835c60519bc8185a6b91988e0690f241a194fea.tar.bz2 mpv-6835c60519bc8185a6b91988e0690f241a194fea.tar.xz |
fix subvindov
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1792 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
-rw-r--r-- | Gui/mplayer/mplayer.c | 1 | ||||
-rw-r--r-- | Gui/mplayer/mw.h | 3 | ||||
-rw-r--r-- | Gui/mplayer/play.c | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/Gui/mplayer/mplayer.c b/Gui/mplayer/mplayer.c index f5cccd0381..a56020ce5f 100644 --- a/Gui/mplayer/mplayer.c +++ b/Gui/mplayer/mplayer.c @@ -78,7 +78,6 @@ void mplInit( int argc,char* argv[], char *envp[], void* disp ) vo_setwindow(appMPlayer.subWindow.WindowID, appMPlayer.subWindow.wGC); vo_setwindowsize( appMPlayer.sub.width,appMPlayer.sub.height ); - mplSubRender=0; wsCreateWindow( &appMPlayer.mainWindow, appMPlayer.main.x,appMPlayer.main.y,appMPlayer.main.width,appMPlayer.main.height, diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h index cd9834d3f3..63fae36ace 100644 --- a/Gui/mplayer/mw.h +++ b/Gui/mplayer/mw.h @@ -323,9 +323,6 @@ NoPause: case evSetBalance: mixerSetBalance( param ); break; case evMute: mixerMute(); break; -// case evIncAudioBufDelay: mplIncAudioBufDelay(); break; -// case evDecAudioBufDelay: mplDecAudioBufDelay(); break; - case evNormalSize: if ( mplShMem->Playing ) { diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c index 11a45ef4fa..aa2aa81360 100644 --- a/Gui/mplayer/play.c +++ b/Gui/mplayer/play.c @@ -53,6 +53,7 @@ void mplStop() printf("%%%%%% STOP \n"); // --- mplShMem->Playing=0; + mplSubRender=1; } void mplPlay( void ) @@ -63,6 +64,7 @@ void mplPlay( void ) printf("%%%%%% PLAY \n"); // --- mplShMem->Playing=1; + mplSubRender=0; } void mplPause( void ) @@ -72,6 +74,7 @@ void mplPause( void ) printf("%%%%%% PAUSE \n"); // --- mplShMem->Playing=2; + mplSubRender=0; } void mplResize( unsigned int X,unsigned int Y,unsigned int width,unsigned int height ) |