Add some tests; fix failure to make DCP when there is a bit of audio right at the...

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

diff --git a/src/lib/butler.h b/src/lib/butler.h
index 948a78ea5f64d79dfa82c9ddc864f48b56556927..f68504f0e5cdb2e19384a5b34c3ea83e7b092789 100644 (file)
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -47,7 +47,7 @@ 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);
        void player_changed ();
        bool should_run () const;
 
@@ -58,18 +58,19 @@ private:
        VideoRingBuffers _video;
        AudioRingBuffers _audio;
 
+       /** mutex to protect _pending_seek_position, _pending_seek_acurate, _finished, _died, _stop_thread */
        boost::mutex _mutex;
        boost::condition _summon;
        boost::condition _arrived;
        boost::optional<DCPTime> _pending_seek_position;
        bool _pending_seek_accurate;
-
        bool _finished;
+       bool _died;
+       bool _stop_thread;
 
        AudioMapping _audio_mapping;
        int _audio_channels;
 
-       bool _stop_thread;
        bool _disable_audio;
 
        boost::signals2::scoped_connection _player_video_connection;