comparison mplayer.c @ 33155:16e5b7f9ddb8

Send udp master updates also when paused and let slave use normal timing when it gets no messages. This allows the slave to continue playing normally if the master crashes or network stops working instead of hanging forever. Note that the slave might still hang for the 30 second network timeout in some cases.

33154:f6a049eff960

	reinit_audio_chain();
    }
    return 1;
}

static int sleep_until_update(float *time_frame, float *aq_sleep_time)
{
    int frame_time_remaining = 0;
    current_module="calc_sleep_time";

    // flag 256 means: libvo driver does its timing (dvb card)
    if (*time_frame > 0.001 && !(vo_flags&256))
	*time_frame = timing_sleep(*time_frame);

#ifdef CONFIG_NETWORKING
    if (udp_master) {
      char current_time[256];
      snprintf(current_time, sizeof(current_time), "%f", mpctx->sh_video->pts);
      send_udp(udp_ip, udp_port, current_time);
    }
#endif /* CONFIG_NETWORKING */

    return frame_time_remaining;
}

int reinit_video_chain(void) {

                           new_cache_fill);
                old_cache_fill = new_cache_fill;
            }
        }
#endif
        usec_sleep(20000);
    }
    if (cmd && cmd->id == MP_CMD_PAUSE) {
        cmd = mp_input_get_cmd(0,1,0);
        mp_cmd_free(cmd);

33155:16e5b7f9ddb8

	reinit_audio_chain();
    }
    return 1;
}

static void handle_udp_master(double time)
{
#ifdef CONFIG_NETWORKING
    if (udp_master) {
      char current_time[256];
      snprintf(current_time, sizeof(current_time), "%f", time);
      send_udp(udp_ip, udp_port, current_time);
    }
#endif /* CONFIG_NETWORKING */
}

static int sleep_until_update(float *time_frame, float *aq_sleep_time)
{
    int frame_time_remaining = 0;
    current_module="calc_sleep_time";

    // flag 256 means: libvo driver does its timing (dvb card)
    if (*time_frame > 0.001 && !(vo_flags&256))
	*time_frame = timing_sleep(*time_frame);

    handle_udp_master(mpctx->sh_video->pts);

    return frame_time_remaining;
}

int reinit_video_chain(void) {

                           new_cache_fill);
                old_cache_fill = new_cache_fill;
            }
        }
#endif
        handle_udp_master(mpctx->sh_video->pts);
        usec_sleep(20000);
    }
    if (cmd && cmd->id == MP_CMD_PAUSE) {
        cmd = mp_input_get_cmd(0,1,0);
        mp_cmd_free(cmd);