Mercurial > mplayer.hg
changeset 6699:9fc877cee29a
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.
| author | atmos4 |
|---|---|
| date | Wed, 10 Jul 2002 13:40:32 +0000 |
| parents | ebe660cf5752 |
| children | 3b1be2b0fa55 |
| files | mplayer.c |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mplayer.c Wed Jul 10 08:56:06 2002 +0000 +++ b/mplayer.c Wed Jul 10 13:40:32 2002 +0000 @@ -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