diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-06 23:54:20 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-06 23:54:20 +0000 |
commit | 94a0c1f6611d6e52a3f258b1eaae20bd5b55b9cb (patch) | |
tree | 8d16df2526ef323bcd0eed6905b87bf5ae5aca0a /Gui/mplayer | |
parent | e2c91bcfcf3cc360f8c56dc9c4afca4eee5351ec (diff) | |
download | mpv-94a0c1f6611d6e52a3f258b1eaae20bd5b55b9cb.tar.bz2 mpv-94a0c1f6611d6e52a3f258b1eaae20bd5b55b9cb.tar.xz |
small changes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4964 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/mplayer')
-rw-r--r-- | Gui/mplayer/mw.h | 16 | ||||
-rw-r--r-- | Gui/mplayer/play.c | 9 |
2 files changed, 7 insertions, 18 deletions
diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h index cdb34d61c2..745349d573 100644 --- a/Gui/mplayer/mw.h +++ b/Gui/mplayer/mw.h @@ -222,11 +222,8 @@ play_dvd_2: #endif case evPlay: case evPlaySwitchToPause: -// btnModify( evPlaySwitchToPause,btnDisabled ); -// btnModify( evPauseSwitchToPlay,btnReleased ); mplMainAutoPlay=0; if ( ( msg == evPlaySwitchToPause )&( guiIntfStruct.Playing == 1 ) ) goto NoPause; - mplMainRender=1; switch ( guiIntfStruct.StreamType ) { @@ -242,7 +239,7 @@ play_dvd_2: #endif } mplPlay(); - mplState(); + mplMainRender=1; break; #ifdef USE_DVDREAD case evSetDVDSubtitle: @@ -279,19 +276,14 @@ play_dvd_2: case evPause: case evPauseSwitchToPlay: -// btnModify( evPlaySwitchToPause,btnReleased ); -// btnModify( evPauseSwitchToPlay,btnDisabled ); NoPause: - mplMainRender=1; mplPause(); + mplMainRender=1; break; case evStop: -// btnModify( evPlaySwitchToPause,btnReleased ); -// btnModify( evPauseSwitchToPlay,btnDisabled ); - mplMainRender=1; mplStop(); - mplState(); + mplMainRender=1; break; case evLoadPlay: @@ -563,6 +555,7 @@ void mplMainKeyHandle( int State,int Type,int Key ) if ( Type != wsKeyPressed ) return; switch ( Key ) { + case wsEnter: msg=evPlay; break; #ifndef HAVE_NEW_INPUT case '.': case '>': msg=evNext; break; @@ -571,7 +564,6 @@ void mplMainKeyHandle( int State,int Type,int Key ) case wsEscape: msg=evExit; break; - case wsEnter: msg=evPlay; break; case wsSpace: msg=evPause; break; case wsa: case wsA: msg=evAbout; break; diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c index 5122c8849d..2cd24611f5 100644 --- a/Gui/mplayer/play.c +++ b/Gui/mplayer/play.c @@ -66,6 +66,7 @@ void mplStop() wsResizeWindow( &appMPlayer.subWindow,appMPlayer.sub.width,appMPlayer.sub.height ); wsMoveWindow( &appMPlayer.subWindow,True,appMPlayer.sub.x,appMPlayer.sub.y ); } + guiGetEvent( guiCEvent,guiSetStop ); mplSubRender=1; wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB ); wsClearWindow( appMPlayer.subWindow ); @@ -78,11 +79,11 @@ void mplPlay( void ) ( guiIntfStruct.Filename[0] == 0 )|| ( guiIntfStruct.Playing == 1 ) ) return; if ( guiIntfStruct.Playing == 2 ) { mplPause(); return; } - guiIntfStruct.Playing=1; + guiGetEvent( guiCEvent,guiSetPlay ); mplSubRender=0; wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 ); wsClearWindow( appMPlayer.subWindow ); - wsPostRedisplay( &appMPlayer.subWindow ); +// wsPostRedisplay( &appMPlayer.subWindow ); } void mplPause( void ) @@ -91,13 +92,9 @@ void mplPause( void ) { case 1: // playing guiIntfStruct.Playing=2; -// btnModify( evPlaySwitchToPause,btnReleased ); -// btnModify( evPauseSwitchToPlay,btnDisabled ); break; case 2: // paused guiIntfStruct.Playing=1; -// btnModify( evPlaySwitchToPause,btnDisabled ); -// btnModify( evPauseSwitchToPlay,btnReleased ); break; } mplState(); |