Mercurial > mplayer.hg

changeset 33666:0f592e8530f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change return code of guiGetEvent() to indicate success.
author ib
date Tue, 28 Jun 2011 10:55:17 +0000
parents 69a8042c7017
children adb10970ec83
files gui/interface.c gui/win32/interface.c mplayer.c
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/gui/interface.c	Tue Jun 28 09:23:16 2011 +0000
+++ b/gui/interface.c	Tue Jun 28 10:55:17 2011 +0000
@@ -757,7 +757,7 @@
         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 @@
         break;
     }
 
-    return False;
+    return True;
 }
 
 void guiEventHandling(void)
--- a/gui/win32/interface.c	Tue Jun 28 09:23:16 2011 +0000
+++ b/gui/win32/interface.c	Tue Jun 28 10:55:17 2011 +0000
@@ -695,7 +695,7 @@
                     free(mygui);
                     mygui = NULL;
                     exit_player(EXIT_QUIT);
-                    return 0;
+                    return 1;
                 }
                 default:
                     break;
@@ -750,7 +750,7 @@
         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 */
--- a/mplayer.c	Tue Jun 28 09:23:16 2011 +0000
+++ b/mplayer.c	Tue Jun 28 10:55:17 2011 +0000
@@ -3677,7 +3677,7 @@
 
 #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);
         }