[MPlayer-cvslog] r33754 - in trunk: gui/interface.c gui/win32/interface.c mplayer.c

[ib]

Author: ib
Date: Tue Jun 28 12:55:17 2011
New Revision: 33754

Log:
Change return code of guiGetEvent() to indicate success.

Modified:
   trunk/gui/interface.c
   trunk/gui/win32/interface.c
   trunk/mplayer.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Tue Jun 28 11:23:16 2011	(r33753)
+++ trunk/gui/interface.c	Tue Jun 28 12:55:17 2011	(r33754)
@@ -757,7 +757,7 @@ int guiGetEvent(int type, void *arg)
         if (video_driver_list && !gstrcmp(video_driver_list[0], "dxr3") && (((demuxer_t *)mpctx_get_demuxer(guiInfo.mpcontext))->file_format != DEMUXER_TYPE_MPEG_PS) && !gtkVfLAVC) {
             gtkMessageBox(GTK_MB_FATAL, MSGTR_NEEDLAVC);
             guiInfo.Playing = 0;
-            return True;
+            return False;
         }
 #endif
 
@@ -996,7 +996,7 @@ int guiGetEvent(int type, void *arg)
         break;
     }
 
-    return False;
+    return True;
 }
 
 void guiEventHandling(void)

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Tue Jun 28 11:23:16 2011	(r33753)
+++ trunk/gui/win32/interface.c	Tue Jun 28 12:55:17 2011	(r33754)
@@ -695,7 +695,7 @@ int guiGetEvent(int type, void *arg)
                     free(mygui);
                     mygui = NULL;
                     exit_player(EXIT_QUIT);
-                    return 0;
+                    return 1;
                 }
                 default:
                     break;
@@ -750,7 +750,7 @@ int guiGetEvent(int type, void *arg)
         default:
             mp_msg(MSGT_GPLAYER, MSGL_ERR, "[GUI] GOT UNHANDLED EVENT %i\n", type);
     }
-    return 0;
+    return 1;
 }
 
 /* This function adds/inserts one file into the gui playlist */

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Tue Jun 28 11:23:16 2011	(r33753)
+++ trunk/mplayer.c	Tue Jun 28 12:55:17 2011	(r33754)
@@ -3677,7 +3677,7 @@ goto_enable_cache:
 
 #ifdef CONFIG_GUI
         if (use_gui) {
-            if (guiGetEvent(guiSetVideo, mpctx->sh_video))
+            if (!guiGetEvent(guiSetVideo, mpctx->sh_video))
                 goto goto_next_file;
             guiGetEvent(guiSetAudio, mpctx->sh_audio);
         }