Timestamp audio emissions from butler and hence discard very late

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

diff --git a/src/lib/butler.h b/src/lib/butler.h
index 1e8947f9d2d554f4e58af0bdc4f6cdef0474e77a..e6553cf8c65d05958bf53fdec6a316938c9e5cc2 100644 (file)
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -29,34 +29,41 @@
 #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);
        std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> get_video ();
-       bool get_audio (float* out, Frame frames);
+       boost::optional<DCPTime> get_audio (float* out, Frame frames);
 
        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 ();
+       void audio (boost::shared_ptr<AudioBuffers> audio, DCPTime time);
        bool should_run () const;
        void prepare (boost::weak_ptr<PlayerVideo> video) const;
+       void player_changed (int);
+       void seek_unlocked (DCPTime position, bool accurate);
 
-       boost::weak_ptr<const Film> _film;
        boost::shared_ptr<Player> _player;
+       boost::shared_ptr<Log> _log;
        boost::thread* _thread;
 
+       /** mutex to protect _video and _audio for when we are clearing them and they both need to be
+           cleared together without any data being inserted in the interim.
+       */
+       boost::mutex _video_audio_mutex;
        VideoRingBuffers _video;
        AudioRingBuffers _audio;
 
@@ -79,6 +86,11 @@ private:
 
        bool _disable_audio;
 
+       /** If we are waiting to be refilled following a seek, this is the time we were
+           seeking to.
+       */
+       boost::optional<DCPTime> _awaiting;
+
        boost::signals2::scoped_connection _player_video_connection;
        boost::signals2::scoped_connection _player_audio_connection;
        boost::signals2::scoped_connection _player_changed_connection;