, _log (log)
, _prepare_work (new boost::asio::io_service::work (_prepare_service))
, _pending_seek_accurate (false)
+ , _suspended (0)
, _finished (false)
, _died (false)
, _stop_thread (false)
{
_player_video_connection = _player->Video.connect (bind (&Butler::video, this, _1, _2));
_player_audio_connection = _player->Audio.connect (bind (&Butler::audio, this, _1, _2));
- _player_text_connection = _player->Text.connect (bind (&Butler::text, this, _1, _2, _3));
- _player_changed_connection = _player->Changed.connect (bind (&Butler::return_seek, this, _2));
- _player_not_changed_connection = _player->NotChanged.connect (bind (&Butler::return_seek, this, false));
+ _player_text_connection = _player->Text.connect (bind (&Butler::text, this, _1, _2, _3, _4));
+ /* The butler must here about things first, otherwise it might not sort out suspensions in time for
+ get_video() to be called in response to this signal.
+ */
+ _player_change_connection = _player->Change.connect (bind (&Butler::player_change, this, _1, _3), boost::signals2::at_front);
_thread = new boost::thread (bind (&Butler::thread, this));
#ifdef DCPOMATIC_LINUX
pthread_setname_np (_thread->native_handle(), "butler");
LOG_WARNING ("Butler audio buffers reached %1 frames (video is %2)", _audio.size(), _video.size());
}
- if (_stop_thread || _finished || _died) {
+ if (_stop_thread || _finished || _died || _suspended) {
/* Definitely do not run */
return false;
}
return r;
}
-optional<pair<PlayerText, DCPTimePeriod> >
+optional<TextRingBuffers::Data>
Butler::get_closed_caption ()
{
boost::mutex::scoped_lock lm (_mutex);
{
boost::mutex::scoped_lock lm (_mutex);
- if (_pending_seek_position) {
- /* Don't store any video while a seek is pending */
+ if (_pending_seek_position || _suspended) {
+ /* Don't store any video in these cases */
return;
}
{
{
boost::mutex::scoped_lock lm (_mutex);
- if (_pending_seek_position || _disable_audio) {
- /* Don't store any audio while a seek is pending, or if audio is disabled */
+ if (_pending_seek_position || _disable_audio || _suspended) {
+ /* Don't store any audio in these cases */
return;
}
}
}
void
-Butler::return_seek (bool frequent)
+Butler::player_change (ChangeType type, bool frequent)
{
boost::mutex::scoped_lock lm (_mutex);
- if (_died || _pending_seek_position || frequent) {
- return;
- }
- DCPTime seek_to;
- DCPTime next = _video.get().second;
- if (_awaiting && _awaiting > next) {
- /* We have recently done a player_changed seek and our buffers haven't been refilled yet,
- so assume that we're seeking to the same place as last time.
- */
- seek_to = *_awaiting;
- } else {
- seek_to = next;
+ if (type == CHANGE_TYPE_PENDING) {
+ ++_suspended;
+ } else if (type == CHANGE_TYPE_DONE) {
+ --_suspended;
+ if (_died || _pending_seek_position || frequent) {
+ lm.unlock ();
+ _summon.notify_all ();
+ return;
+ }
+
+ DCPTime seek_to;
+ DCPTime next = _video.get().second;
+ if (_awaiting && _awaiting > next) {
+ /* We have recently done a player_changed seek and our buffers haven't been refilled yet,
+ so assume that we're seeking to the same place as last time.
+ */
+ seek_to = *_awaiting;
+ } else {
+ seek_to = next;
+ }
+
+ seek_unlocked (seek_to, true);
+ _awaiting = seek_to;
+ } else if (type == CHANGE_TYPE_CANCELLED) {
+ --_suspended;
}
- seek_unlocked (seek_to, true);
- _awaiting = seek_to;
+ lm.unlock ();
+ _summon.notify_all ();
}
void
-Butler::text (PlayerText pt, TextType type, DCPTimePeriod period)
+Butler::text (PlayerText pt, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
{
if (type != TEXT_CLOSED_CAPTION) {
return;
}
+ DCPOMATIC_ASSERT (track);
+
boost::mutex::scoped_lock lm2 (_buffers_mutex);
- _closed_caption.put (make_pair(pt, period));
+ _closed_caption.put (pt, *track, period);
}