Tidy and fix logging.

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

diff --git a/src/lib/butler.h b/src/lib/butler.h
index fb133d10809413298364faba4e02a8d62c42c5b1..4f4e508843d8cb04f45fc545a4f13119b8b5ecdd 100644 (file)
--- 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);
@@ -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.
        */