From af9894563f66e8d63256535f65dcb296ee044139 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 23 Apr 2017 20:30:10 +0100 Subject: [PATCH] Cope better with the butler thread throwing an exception; stop the butler doing anything so that the exception can be reported. --- src/lib/player.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/lib/player.cc b/src/lib/player.cc index 2a5452e1e..5fb349b0e 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -584,6 +584,9 @@ Player::pass () list, DCPTime> > audio = _audio_merger.pull (pull_from); for (list, DCPTime> >::iterator i = audio.begin(); i != audio.end(); ++i) { + if (_last_audio_time && i->second < _last_audio_time.get()) { + cout << "FAIL " << to_string(i->second) << " " << to_string(_last_audio_time.get()) << "\n"; + } DCPOMATIC_ASSERT (!_last_audio_time || i->second >= _last_audio_time.get()); if (_last_audio_time) { fill_audio (DCPTimePeriod (_last_audio_time.get(), i->second)); @@ -914,9 +917,11 @@ Player::seek (DCPTime time, bool accurate) if (accurate) { _last_video_time = time - one_video_frame (); _last_audio_time = time; + cout << "_last_audio_time -> " << to_string(time) << "\n"; } else { _last_video_time = optional (); _last_audio_time = optional (); + cout << "_last_audio_time -> []\n"; } } -- 2.30.2