summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorods15 <ods15@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-12-25 19:22:48 +0000
committerods15 <ods15@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-12-25 19:22:48 +0000
commit3c3d7c203924daa93aa1a1a57d3bc2b1b7e46161 (patch)
treecd34dfce1b79d95c48788f2ab187ab1219c4b352 /mplayer.c
parent95db0aeb236eebd0f6c517078bc8df299599a02a (diff)
downloadmpv-3c3d7c203924daa93aa1a1a57d3bc2b1b7e46161.tar.bz2
mpv-3c3d7c203924daa93aa1a1a57d3bc2b1b7e46161.tar.xz
add "pausing_keep" and "pausing_toggle" input cmd prefixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17242 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/mplayer.c b/mplayer.c
index fcf3c085d6..929d326c5b 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2448,6 +2448,7 @@ unsigned int lastframeout_ts=0;
float next_frame_time=0;
int frame_time_remaining=0; // flag
int blit_frame=0;
+int was_paused=0;
osd_text_buffer[0]=0;
// make sure OSD old does not stay around,
@@ -3047,6 +3048,7 @@ if(auto_quality>0){
guiGetEvent( guiCEvent,(char *)guiSetPlay );
}
#endif
+ was_paused = 1;
}
// handle -sstep
@@ -4129,11 +4131,20 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
mp_msg(MSGT_CPLAYER, MSGL_V, "Received unknown cmd %s\n",cmd->name);
}
}
- if (cmd->pausing)
- osd_function = OSD_PAUSE;
+ switch (cmd->pausing) {
+ case 1: // "pausing"
+ osd_function = OSD_PAUSE;
+ break;
+ case 3: // "pausing_toggle"
+ was_paused = !was_paused;
+ // fall through
+ case 2: // "pausing_keep"
+ if (was_paused) osd_function = OSD_PAUSE;
+ }
mp_cmd_free(cmd);
}
}
+ was_paused = 0;
if (seek_to_sec) {
int a,b; float d;