diff mplayer.c @ 33486:e46989c7f47e

Change -udp-slave code to temporarily fall back to normal timing after 30s network timeout. This is the second try, this time tested with -vo xv to avoid being tricked by vsync. It will also still wait 30s for a message right after startup. As a side-effect it also contains a fix against a minor issue that -udp-slave would start up playing or seeking for files with a non-zero start time.

--- a/mplayer.c	Wed Jun 08 18:25:17 2011 +0000
+++ b/mplayer.c	Wed Jun 08 18:58:10 2011 +0000
@@ -2263,11 +2263,11 @@
 #ifdef CONFIG_NETWORKING
     if (udp_slave) {
         int udp_master_exited = udp_slave_sync(mpctx);
-        if (udp_master_exited) {
+        if (udp_master_exited > 0) {
             mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_MasterQuit);
             exit_player(EXIT_QUIT);
-        }
-        return 0;
+        } else if (udp_master_exited == 0)
+            return 0;
     }
 #endif /* CONFIG_NETWORKING */