Remove dubious _buffers_mutex and maintain a lock on _mutex for

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

diff --git a/src/lib/butler.h b/src/lib/butler.h
index e5581ccb42169e6f07e555d174c348d1b49517ec..ea43374434f033a5becfebc13f2fce09a6436d5c 100644 (file)
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -75,12 +75,6 @@ private:
        boost::shared_ptr<Player> _player;
        boost::thread* _thread;
 
-       /** mutex to protect _video, _audio and _closed_caption for when we are clearing them and they all need to be
-           cleared together without any data being inserted in the interim;
-           XXX: is this necessary now that all butler output data is timestamped? Perhaps the locked clear-out
-           is only required if we guarantee that get_video() and get_audio() calls are in sync.
-       */
-       boost::mutex _buffers_mutex;
        VideoRingBuffers _video;
        AudioRingBuffers _audio;
        TextRingBuffers _closed_caption;