diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-04-23 20:30:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-04-23 20:30:10 +0100 |
| commit | af9894563f66e8d63256535f65dcb296ee044139 (patch) | |
| tree | d157415e4576ae311c6aba72c672c3e1761548d7 /src/lib | |
| parent | 671ca74d521e101f83f45a0b1492602e607b6ad3 (diff) | |
Cope better with the butler thread throwing an exception; stop the butler doing anything so that the exception can be reported.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/player.cc | 5 |
1 files changed, 5 insertions, 0 deletions
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<pair<shared_ptr<AudioBuffers>, DCPTime> > audio = _audio_merger.pull (pull_from); for (list<pair<shared_ptr<AudioBuffers>, 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<DCPTime> (); _last_audio_time = optional<DCPTime> (); + cout << "_last_audio_time -> []\n"; } } |