Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/butler.h b/src/lib/butler.h
index 4f4e508843d8cb04f45fc545a4f13119b8b5ecdd..8c4d30efefbad224ce47731c353791511296160d 100644 (file)
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -65,10 +65,10 @@ 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);