Fix a couple more crashes with incorrect KDMs (#1000).

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

diff --git a/src/lib/butler.h b/src/lib/butler.h
index 1e8947f9d2d554f4e58af0bdc4f6cdef0474e77a..a61011f4019fa1ddcc5e6e01f184a9e9011a3fb0 100644 (file)
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -29,14 +29,14 @@
 #include <boost/signals2.hpp>
 #include <boost/asio.hpp>
 
-class Film;
 class Player;
 class PlayerVideo;
+class Log;
 
 class Butler : public ExceptionStore, public boost::noncopyable
 {
 public:
-       Butler (boost::weak_ptr<const Film> film, boost::shared_ptr<Player> player, AudioMapping map, int audio_channels);
+       Butler (boost::shared_ptr<Player> player, boost::shared_ptr<Log> log, AudioMapping map, int audio_channels);
        ~Butler ();
 
        void seek (DCPTime position, bool accurate);
@@ -45,16 +45,17 @@ public:
 
        void disable_audio ();
 
+       std::pair<size_t, std::string> memory_used () const;
+
 private:
        void thread ();
        void video (boost::shared_ptr<PlayerVideo> video, DCPTime time);
        void audio (boost::shared_ptr<AudioBuffers> audio);
-       void player_changed ();
        bool should_run () const;
        void prepare (boost::weak_ptr<PlayerVideo> video) const;
 
-       boost::weak_ptr<const Film> _film;
        boost::shared_ptr<Player> _player;
+       boost::shared_ptr<Log> _log;
        boost::thread* _thread;
 
        VideoRingBuffers _video;
@@ -81,5 +82,4 @@ private:
 
        boost::signals2::scoped_connection _player_video_connection;
        boost::signals2::scoped_connection _player_audio_connection;
-       boost::signals2::scoped_connection _player_changed_connection;
 };