X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbutler.h;h=4d4fa4a0939d86186e54c2488e9478fa4f29baeb;hb=de6798c0208e9a6a64b0f8edc54f03b46ced0e22;hp=b1debfca2b2c948bb407cb8faa3cc844d6444ae3;hpb=f41310384889e4cfb6e709d098b316e212d8bf22;p=dcpomatic.git

diff --git a/src/lib/butler.h b/src/lib/butler.h
index b1debfca2..4d4fa4a09 100644
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -32,14 +32,12 @@
 
 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,
 		boost::function<AVPixelFormat (AVPixelFormat)> pixel_format,
@@ -53,7 +51,8 @@ public:
 
 	enum Error {
 		NONE,
-		AGAIN
+		AGAIN,
+		DIED
 	};
 
 	std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> get_video (Error* e = 0);
@@ -67,15 +66,14 @@ 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;
+	void prepare (boost::weak_ptr<PlayerVideo> video);
 	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