Build Empty objects from the presence or absence of decoders in

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

diff --git a/src/lib/butler.h b/src/lib/butler.h
index 56374deeb31a9c904b7f2dd175e64b82463ceffc..4322c401dc1b62824470c8a0d7df0aeaf35a3ecf 100644 (file)
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -43,7 +43,7 @@ public:
        void seek (DCPTime position, bool accurate);
        std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> get_video ();
        boost::optional<DCPTime> get_audio (float* out, Frame frames);
-       boost::optional<std::pair<PlayerText, DCPTimePeriod> > get_closed_caption ();
+       boost::optional<TextRingBuffers::Data> get_closed_caption ();
 
        void disable_audio ();
 
@@ -53,10 +53,10 @@ private:
        void thread ();
        void video (boost::shared_ptr<PlayerVideo> video, DCPTime time);
        void audio (boost::shared_ptr<AudioBuffers> audio, DCPTime time);
-       void text (PlayerText pt, TextType type, DCPTimePeriod period);
+       void text (PlayerText pt, TextType type, boost::optional<DCPTextTrack> track, DCPTimePeriod period);
        bool should_run () const;
        void prepare (boost::weak_ptr<PlayerVideo> video) const;
-       void return_seek (bool frequent);
+       void player_change (ChangeType type, bool frequent);
        void seek_unlocked (DCPTime position, bool accurate);
 
        boost::shared_ptr<Player> _player;
@@ -83,6 +83,7 @@ private:
        boost::condition _arrived;
        boost::optional<DCPTime> _pending_seek_position;
        bool _pending_seek_accurate;
+       int _suspended;
        bool _finished;
        bool _died;
        bool _stop_thread;
@@ -100,6 +101,5 @@ private:
        boost::signals2::scoped_connection _player_video_connection;
        boost::signals2::scoped_connection _player_audio_connection;
        boost::signals2::scoped_connection _player_text_connection;
-       boost::signals2::scoped_connection _player_changed_connection;
-       boost::signals2::scoped_connection _player_not_changed_connection;
+       boost::signals2::scoped_connection _player_change_connection;
 };