small changes

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4964 b3059339-0415-0410-9bf9-f77b7e298cf2

4 files changed, 18 insertions, 18 deletions

diff --git a/Gui/interface.c b/Gui/interface.c
index d0f368573e..a365f1b0b5 100644
--- a/Gui/interface.c
+++ b/Gui/interface.c
@@ -53,6 +53,12 @@ void guiGetEvent( int type,char * arg )
         gtkEventHandling();
         break;
    case guiCEvent:
+        switch ( (int)arg )
+	 {
+          case guiSetPlay:  guiIntfStruct.Playing=1; mplState(); break;
+          case guiSetStop:  guiIntfStruct.Playing=0; mplState(); break;
+          case guiSetPause: guiIntfStruct.Playing=2; mplState(); break;
+	 }
         break;
    case guiIEvent:
         printf( "cmd: %d\n",(int)arg );
@@ -76,4 +82,5 @@ void guiEventHandling( void )
  if ( use_gui && !guiIntfStruct.Playing ) wsHandleEvents();
  gtkEventHandling();
  mplTimerHandler(); // handle GUI timer events
+ mplState();
 }
diff --git a/Gui/interface.h b/Gui/interface.h
index cdf7a8df4c..f1e24b29a2 100644
--- a/Gui/interface.h
+++ b/Gui/interface.h
@@ -97,6 +97,10 @@ extern guiInterface_t guiIntfStruct;
 #define guiCEvent 1
 #define guiIEvent 2
 
+#define guiSetStop  0
+#define guiSetPlay  1
+#define guiSetPause 2
+
 extern void guiInit( int argc,char* argv[], char *envp[] );
 extern void guiGetEvent( int type,char * arg );
 extern void guiEventHandling( void );
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();