Add player DCP directory to config.

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

diff --git a/src/lib/butler.h b/src/lib/butler.h
index 0b926047a63e50fb054a167a161b220de28ffd4e..fb133d10809413298364faba4e02a8d62c42c5b1 100644 (file)
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -41,9 +41,15 @@ public:
        ~Butler ();
 
        void seek (DCPTime position, bool accurate);
-       std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> get_video ();
+
+       enum Error {
+               NONE,
+               AGAIN
+       };
+
+       std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> get_video (Error* e = 0);
        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 +59,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 player_changed ();
+       void player_change (ChangeType type, bool frequent);
        void seek_unlocked (DCPTime position, bool accurate);
 
        boost::shared_ptr<Player> _player;
@@ -83,6 +89,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,5 +107,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_change_connection;
 };