diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-08-02 15:52:11 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-08-14 21:07:48 +0100 |
| commit | d66bcea066deb3b3cd919a69aab7e2078fb52ca8 (patch) | |
| tree | cb2282b43244129f467a26576603845ad8abe3e0 /src/lib/butler.h | |
| parent | 69829c8c664d301de3f123f9893210eea89d8026 (diff) | |
Remove Film dependency from Butler.
Diffstat (limited to 'src/lib/butler.h')
| -rw-r--r-- | src/lib/butler.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/butler.h b/src/lib/butler.h index 1e8947f9d..e416ba818 100644 --- 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); @@ -53,8 +53,8 @@ private: 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; |