diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-22 20:21:19 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-22 20:21:19 +0000 |
| commit | 3e3a2a4e05ad4a0f5f211b2c61a69e7575710dcb (patch) | |
| tree | 023a989eb97c81eb7c06faf0f9012f2b681a46db /libvo | |
| parent | 2f0fd9d6cc2ff87c6e79ebbc2fbb2c624ab3efdb (diff) | |
| download | mpv-3e3a2a4e05ad4a0f5f211b2c61a69e7575710dcb.tar.bz2 mpv-3e3a2a4e05ad4a0f5f211b2c61a69e7575710dcb.tar.xz | |
Saner handling of VOCTRL_PAUSE/VOCTRL_RESUME
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26855 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_gl.c | 6 | ||||
| -rw-r--r-- | libvo/vo_gl2.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index d378df0836..dc4a2452b4 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -935,8 +935,10 @@ static const struct { static int control(uint32_t request, void *data, ...) { switch (request) { - case VOCTRL_PAUSE: return int_pause = 1; - case VOCTRL_RESUME: return int_pause = 0; + case VOCTRL_PAUSE: + case VOCTRL_RESUME: + int_pause = (request == VOCTRL_PAUSE); + return VO_TRUE; case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t*)data)); case VOCTRL_GET_IMAGE: diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c index 2d735c667b..7c73099dbc 100644 --- a/libvo/vo_gl2.c +++ b/libvo/vo_gl2.c @@ -870,8 +870,10 @@ static int preinit(const char *arg) static int control(uint32_t request, void *data, ...) { switch (request) { - case VOCTRL_PAUSE: return int_pause = 1; - case VOCTRL_RESUME: return int_pause = 0; + case VOCTRL_PAUSE: + case VOCTRL_RESUME: + int_pause = (request == VOCTRL_PAUSE); + return VO_TRUE; case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t*)data)); case VOCTRL_GUISUPPORT: |