comparison mplayer.c @ 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.

6698:ebe660cf5752

    }
  }
#endif

  if(osd_function==OSD_PAUSE){
#ifdef HAVE_NEW_INPUT    
    mp_cmd_t* cmd;
#endif
      if(!quiet) {
	mp_msg(MSGT_CPLAYER,MSGL_STATUS,"\n------ PAUSED -------\r");

        while(
#ifdef HAVE_LIRC
             lirc_mp_getinput()<=0 &&
#endif
             (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();
#ifdef HAVE_NEW_GUI
             if(use_gui){
		guiEventHandling();
		guiGetEvent( guiReDraw,NULL );
		if(guiIntfStruct.Playing!=2 || (rel_seek_secs || abs_seek_pos)) break;

       {
        if ( guiIntfStruct.Playing == guiSetStop ) goto goto_next_file;
        guiGetEvent( guiCEvent,(char *)guiSetPlay );
       }
#endif
  }

// handle -sstep
if(step_sec>0) {
	osd_function=OSD_FFW;

6699:9fc877cee29a

    }
  }
#endif

  if(osd_function==OSD_PAUSE){
    int pkey=-1;
#ifdef HAVE_NEW_INPUT    
    mp_cmd_t* cmd;
#endif
      if(!quiet) {
	mp_msg(MSGT_CPLAYER,MSGL_STATUS,"\n------ PAUSED -------\r");

        while(
#ifdef HAVE_LIRC
             lirc_mp_getinput()<=0 &&
#endif
             (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();
		guiGetEvent( guiReDraw,NULL );
		if(guiIntfStruct.Playing!=2 || (rel_seek_secs || abs_seek_pos)) break;

       {
        if ( guiIntfStruct.Playing == guiSetStop ) goto goto_next_file;
        guiGetEvent( guiCEvent,(char *)guiSetPlay );
       }
#endif
      if(pkey!=32 && pkey!=112)
        mplayer_put_key(pkey); // pass on the key
  }

// handle -sstep
if(step_sec>0) {
	osd_function=OSD_FFW;