White space.

[dcpomatic.git] / src / lib / butler.cc

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index f04b324cdea4cc29e02bbac2a964d5c27c898c4b..a127ee9bdeeff61428e19663d7a2c36f875f5288 100644 (file)
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -54,7 +54,7 @@ Butler::Butler (shared_ptr<Player> player, shared_ptr<Log> log, AudioMapping aud
        , _log (log)
        , _prepare_work (new boost::asio::io_service::work (_prepare_service))
        , _pending_seek_accurate (false)
-       , _suspended (false)
+       , _suspended (0)
        , _finished (false)
        , _died (false)
        , _stop_thread (false)
@@ -64,10 +64,11 @@ Butler::Butler (shared_ptr<Player> player, shared_ptr<Log> log, AudioMapping aud
 {
        _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_may_change_connection = _player->MayChange.connect (bind (&Butler::suspend, this));
-       _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");
@@ -107,10 +108,6 @@ Butler::~Butler ()
 bool
 Butler::should_run () const
 {
-       if (_suspended) {
-               return false;
-       }
-
        if (_video.size() >= MAXIMUM_VIDEO_READAHEAD * 10) {
                /* This is way too big */
                throw ProgrammingError
@@ -131,7 +128,7 @@ Butler::should_run () const
                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;
        }
@@ -211,7 +208,7 @@ Butler::get_video ()
        return r;
 }
 
-optional<pair<PlayerText, DCPTimePeriod> >
+optional<TextRingBuffers::Data>
 Butler::get_closed_caption ()
 {
        boost::mutex::scoped_lock lm (_mutex);
@@ -316,43 +313,50 @@ Butler::memory_used () const
 }
 
 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);
-       _suspended = false;
-       _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;
        }
 
-       boost::mutex::scoped_lock lm2 (_buffers_mutex);
-       _closed_caption.put (make_pair(pt, period));
-}
+       DCPOMATIC_ASSERT (track);
 
-void
-Butler::suspend ()
-{
-       boost::mutex::scoped_lock lm (_mutex);
-       _suspended = true;
+       boost::mutex::scoped_lock lm2 (_buffers_mutex);
+       _closed_caption.put (pt, *track, period);
 }