[MPlayer-cvslog] r26855 - in trunk/libvo: vo_gl.c vo_gl2.c

reimar subversion at mplayerhq.hu
Thu May 22 22:21:19 CEST 2008


Author: reimar
Date: Thu May 22 22:21:19 2008
New Revision: 26855

Log:
Saner handling of VOCTRL_PAUSE/VOCTRL_RESUME


Modified:
   trunk/libvo/vo_gl.c
   trunk/libvo/vo_gl2.c

Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c	(original)
+++ trunk/libvo/vo_gl.c	Thu May 22 22:21:19 2008
@@ -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:

Modified: trunk/libvo/vo_gl2.c
==============================================================================
--- trunk/libvo/vo_gl2.c	(original)
+++ trunk/libvo/vo_gl2.c	Thu May 22 22:21:19 2008
@@ -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:



More information about the MPlayer-cvslog mailing list