From: Carl Hetherington Date: Sat, 10 Mar 2018 00:55:33 +0000 (+0000) Subject: Remove assert in emit_audio to work around #1206. X-Git-Tag: v2.11.73~8 X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=057a3fcfd98e5c8dec16294caf230aee2b5229eb;p=dcpomatic.git Remove assert in emit_audio to work around #1206. --- diff --git a/src/lib/player.cc b/src/lib/player.cc index bd194c373..e8005c655 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -1031,8 +1031,8 @@ Player::emit_audio (shared_ptr data, DCPTime time) _film->log()->log(String::compose("Out-of-sequence emit %1 vs %2", to_string(time), to_string(*_last_audio_time)), LogEntry::TYPE_WARNING); } - /* This audio must follow on from the previous */ - DCPOMATIC_ASSERT (!_last_audio_time || time == *_last_audio_time); + /* This audio must follow on from the previous, but I'll remove this check for the 2.12.x release */ + // DCPOMATIC_ASSERT (!_last_audio_time || time == *_last_audio_time); Audio (data, time); _last_audio_time = time + DCPTime::from_frames (data->frames(), _film->audio_frame_rate()); }