X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbutler.h;h=f1b86a1ab14aa9a3fa390fac16dc00a1b5958cb4;hb=cfcb0f5d66cc68d8d395480a95d4fe95c63e214e;hp=fb133d10809413298364faba4e02a8d62c42c5b1;hpb=4227af1dc74eeb042f6b7bb4a02df2bf89225b0d;p=dcpomatic.git

diff --git a/src/lib/butler.h b/src/lib/butler.h
index fb133d108..f1b86a1ab 100644
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -32,12 +32,19 @@
 
 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);
@@ -58,7 +65,7 @@ public:
 private:
 	void thread ();
 	void video (boost::shared_ptr<PlayerVideo> video, DCPTime time);
-	void audio (boost::shared_ptr<AudioBuffers> audio, DCPTime time);
+	void audio (boost::shared_ptr<AudioBuffers> audio, DCPTime time, int frame_rate);
 	void text (PlayerText pt, TextType type, boost::optional<DCPTextTrack> track, DCPTimePeriod period);
 	bool should_run () const;
 	void prepare (boost::weak_ptr<PlayerVideo> video) const;
@@ -66,7 +73,6 @@ private:
 	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
@@ -99,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.
 	*/