Store audio/video even when suspended.

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

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index 07cb7b22bf7a839edb75a960561095bcc88bfb24..191bb0a5b68b52b006d8e300bb1002d40fb7f49f 100644 (file)
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -64,8 +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_change_connection = _player->Change.connect (bind (&Butler::player_change, this, _1, _3));
+       _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");
@@ -187,17 +190,27 @@ try
 }
 
 pair<shared_ptr<PlayerVideo>, DCPTime>
-Butler::get_video ()
+Butler::get_video (Error* e)
 {
        boost::mutex::scoped_lock lm (_mutex);
 
+       if (_suspended) {
+               if (e) {
+                       *e = AGAIN;
+               }
+               return make_pair(shared_ptr<PlayerVideo>(), DCPTime());
+       }
+
        /* Wait for data if we have none */
-       while (_video.empty() && !_finished && !_died && !_suspended) {
+       while (_video.empty() && !_finished && !_died) {
                _arrived.wait (lm);
        }
 
        if (_video.empty()) {
-               return make_pair (shared_ptr<PlayerVideo>(), DCPTime());
+               if (e) {
+                       *e = NONE;
+               }
+               return make_pair(shared_ptr<PlayerVideo>(), DCPTime());
        }
 
        pair<shared_ptr<PlayerVideo>, DCPTime> const r = _video.get ();
@@ -205,7 +218,7 @@ Butler::get_video ()
        return r;
 }
 
-optional<pair<PlayerText, DCPTimePeriod> >
+optional<TextRingBuffers::Data>
 Butler::get_closed_caption ()
 {
        boost::mutex::scoped_lock lm (_mutex);
@@ -257,8 +270,8 @@ Butler::video (shared_ptr<PlayerVideo> video, DCPTime time)
 {
        boost::mutex::scoped_lock lm (_mutex);
 
-       if (_pending_seek_position || _suspended) {
-               /* Don't store any video in these cases */
+       if (_pending_seek_position) {
+               /* Don't store any video in this case */
                return;
        }
 
@@ -273,7 +286,7 @@ Butler::audio (shared_ptr<AudioBuffers> audio, DCPTime time)
 {
        {
                boost::mutex::scoped_lock lm (_mutex);
-               if (_pending_seek_position || _disable_audio || _suspended) {
+               if (_pending_seek_position || _disable_audio) {
                        /* Don't store any audio in these cases */
                        return;
                }
@@ -319,6 +332,8 @@ Butler::player_change (ChangeType type, bool frequent)
        } else if (type == CHANGE_TYPE_DONE) {
                --_suspended;
                if (_died || _pending_seek_position || frequent) {
+                       lm.unlock ();
+                       _summon.notify_all ();
                        return;
                }
 
@@ -338,15 +353,20 @@ Butler::player_change (ChangeType type, bool frequent)
        } else if (type == CHANGE_TYPE_CANCELLED) {
                --_suspended;
        }
+
+       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);
 }