Rename TYPE_DEBUG_PLAYER to TYPE_DEBUG_VIDEO_VIEW.

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

diff --git a/src/lib/butler.h b/src/lib/butler.h
index 6a13ed2d72548ebcec849a926b51a4a4f379f602..ce3c9ae4859be430633ba6b629edafe94bde79e3 100644 (file)
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -32,18 +32,31 @@
 
 class Player;
 class PlayerVideo;
-class Log;
 
 class Butler : public ExceptionStore, public boost::noncopyable
 {
 public:
-       Butler (boost::shared_ptr<Player> player, boost::shared_ptr<Log> log, AudioMapping map, int audio_channels);
+       Butler (
+               boost::shared_ptr<Player> player,
+               AudioMapping map,
+               int audio_channels,
+               boost::function<AVPixelFormat (AVPixelFormat)> pixel_format,
+               bool aligned,
+               bool fast
+               );
+
        ~Butler ();
 
-       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 ();
+       void seek (dcpomatic::DCPTime position, bool accurate);
+
+       enum Error {
+               NONE,
+               AGAIN
+       };
+
+       std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> get_video (bool blocking, Error* e = 0);
+       boost::optional<dcpomatic::DCPTime> get_audio (float* out, Frame frames);
+       boost::optional<TextRingBuffers::Data> get_closed_caption ();
 
        void disable_audio ();
 
@@ -51,25 +64,17 @@ public:
 
 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 video (boost::shared_ptr<PlayerVideo> video, dcpomatic::DCPTime time);
+       void audio (boost::shared_ptr<AudioBuffers> audio, dcpomatic::DCPTime time, int frame_rate);
+       void text (PlayerText pt, TextType type, boost::optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period);
        bool should_run () const;
-       void prepare (boost::weak_ptr<PlayerVideo> video) const;
-       void suspend ();
-       void return_seek (bool frequent);
-       void seek_unlocked (DCPTime position, bool accurate);
+       void prepare (boost::weak_ptr<PlayerVideo> video);
+       void player_change (ChangeType type);
+       void seek_unlocked (dcpomatic::DCPTime position, bool accurate);
 
        boost::shared_ptr<Player> _player;
-       boost::shared_ptr<Log> _log;
-       boost::thread* _thread;
+       boost::thread _thread;
 
-       /** mutex to protect _video, _audio and _closed_caption for when we are clearing them and they all need to be
-           cleared together without any data being inserted in the interim;
-           XXX: is this necessary now that all butler output data is timestamped? Perhaps the locked clear-out
-           is only required if we guarantee that get_video() and get_audio() calls are in sync.
-       */
-       boost::mutex _buffers_mutex;
        VideoRingBuffers _video;
        AudioRingBuffers _audio;
        TextRingBuffers _closed_caption;
@@ -78,13 +83,13 @@ private:
        boost::asio::io_service _prepare_service;
        boost::shared_ptr<boost::asio::io_service::work> _prepare_work;
 
-       /** mutex to protect _pending_seek_position, _pending_seek_acurate, _finished, _died, _stop_thread */
+       /** mutex to protect _pending_seek_position, _pending_seek_accurate, _finished, _died, _stop_thread */
        boost::mutex _mutex;
        boost::condition _summon;
        boost::condition _arrived;
-       boost::optional<DCPTime> _pending_seek_position;
+       boost::optional<dcpomatic::DCPTime> _pending_seek_position;
        bool _pending_seek_accurate;
-       bool _suspended;
+       int _suspended;
        bool _finished;
        bool _died;
        bool _stop_thread;
@@ -94,15 +99,17 @@ private:
 
        bool _disable_audio;
 
+       boost::function<AVPixelFormat (AVPixelFormat)> _pixel_format;
+       bool _aligned;
+       bool _fast;
+
        /** If we are waiting to be refilled following a seek, this is the time we were
            seeking to.
        */
-       boost::optional<DCPTime> _awaiting;
+       boost::optional<dcpomatic::DCPTime> _awaiting;
 
        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_may_change_connection;
-       boost::signals2::scoped_connection _player_changed_connection;
-       boost::signals2::scoped_connection _player_not_changed_connection;
+       boost::signals2::scoped_connection _player_change_connection;
 };