[Mplayer-cvslog] CVS: main/Gui/mplayer mw.h,1.45,1.46 play.c,1.47,1.48

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mplayer:/var/tmp.root/cvs-serv15398/Gui/mplayer

Modified Files:
	mw.h play.c 
Log Message:
small changes

Index: mw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- mw.h	6 Mar 2002 18:42:56 -0000	1.45
+++ mw.h	6 Mar 2002 23:54:20 -0000	1.46
@@ -222,11 +222,8 @@
 #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 @@
 #endif
          }
         mplPlay();
-        mplState();
+        mplMainRender=1;
         break;
 #ifdef USE_DVDREAD
    case evSetDVDSubtitle:
@@ -279,19 +276,14 @@
 
    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 @@
  if ( Type != wsKeyPressed ) return;
  switch ( Key )
   {
+   case wsEnter:     msg=evPlay; break;
 #ifndef HAVE_NEW_INPUT
    case '.':
    case '>':         msg=evNext; break;
@@ -571,7 +564,6 @@
 
    case wsEscape:    msg=evExit; break;
 
-   case wsEnter:     msg=evPlay; break;
    case wsSpace:     msg=evPause; break;
    case wsa:
    case wsA:         msg=evAbout; break;

Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- play.c	23 Feb 2002 15:12:53 -0000	1.47
+++ play.c	6 Mar 2002 23:54:20 -0000	1.48
@@ -66,6 +66,7 @@
    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 @@
       ( 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 @@
   {
    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();