X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbutler.h;h=4f4e508843d8cb04f45fc545a4f13119b8b5ecdd;hb=ad1ef39eda58b3a919ea3b7084401a0439409ec6;hp=513176821e8f455c46f312d5458534e0809b2e5e;hpb=6c7489e5d778d3e71065d88a094a7383ba2c117d;p=dcpomatic.git

diff --git a/src/lib/butler.h b/src/lib/butler.h
index 513176821..4f4e50884 100644
--- 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 ();
+
+	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,14 +66,13 @@ 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_change (ChangeType type, bool frequent);
 	void seek_unlocked (DCPTime position, bool accurate);
 
 	boost::shared_ptr<Player> _player;
-	boost::shared_ptr<Log> _log;
 	boost::thread* _thread;
 
 	/** mutex to protect _video, _audio and _closed_caption for when we are clearing them and they all need to be
@@ -83,7 +95,7 @@ private:
 	boost::condition _arrived;
 	boost::optional<DCPTime> _pending_seek_position;
 	bool _pending_seek_accurate;
-	bool _suspended;
+	int _suspended;
 	bool _finished;
 	bool _died;
 	bool _stop_thread;
@@ -93,6 +105,10 @@ 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.
 	*/