comparison 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.

33485:2f8dc5fbec77

    current_module = "calc_sleep_time";

#ifdef CONFIG_NETWORKING
    if (udp_slave) {
        int udp_master_exited = udp_slave_sync(mpctx);
        if (udp_master_exited) {
            mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_MasterQuit);
            exit_player(EXIT_QUIT);
        }
        return 0;
    }
#endif /* CONFIG_NETWORKING */

    *time_frame -= GetRelativeTime(); // reset timer

33486:e46989c7f47e

    current_module = "calc_sleep_time";

#ifdef CONFIG_NETWORKING
    if (udp_slave) {
        int udp_master_exited = udp_slave_sync(mpctx);
        if (udp_master_exited > 0) {
            mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_MasterQuit);
            exit_player(EXIT_QUIT);
        } else if (udp_master_exited == 0)
            return 0;
    }
#endif /* CONFIG_NETWORKING */

    *time_frame -= GetRelativeTime(); // reset timer