[Mplayer-cvslog] CVS: main mplayer.c,1.525,1.526

[Atmosfear]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv9857

Modified Files:
	mplayer.c 
Log Message:
Only space and 'p' will unpause, other keys will unpause and do their function (eg. seek),
this is a preparation for the pause at eof feature.


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.525
retrieving revision 1.526
diff -u -r1.525 -r1.526
--- mplayer.c	8 Jul 2002 21:44:51 -0000	1.525
+++ mplayer.c	10 Jul 2002 13:40:32 -0000	1.526
@@ -1891,6 +1891,7 @@
 #endif
 
   if(osd_function==OSD_PAUSE){
+    int pkey=-1;
 #ifdef HAVE_NEW_INPUT    
     mp_cmd_t* cmd;
 #endif
@@ -1929,9 +1930,10 @@
 #ifdef HAVE_LIRC
              lirc_mp_getinput()<=0 &&
 #endif
-             (use_stdin || getch2(20)<=0) && mplayer_get_key()<=0){
+             (use_stdin || getch2(20)<=0) /* && mplayer_get_key()<=0*/){
 #endif /* HAVE_NEW_INPUT */
 	     if(sh_video && video_out && vo_config_count) video_out->check_events();
+             if((pkey=mplayer_get_key()) > 0) break;
 #ifdef HAVE_NEW_GUI
              if(use_gui){
 		guiEventHandling();
@@ -1961,6 +1963,8 @@
         guiGetEvent( guiCEvent,(char *)guiSetPlay );
        }
 #endif
+      if(pkey!=32 && pkey!=112)
+        mplayer_put_key(pkey); // pass on the key
   }
 
 // handle -sstep