Move upload-DCP-to-TMS button to preferences.

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

diff --git a/src/lib/butler.h b/src/lib/butler.h
index 09c182f9cf717fb3c53d6371c7dd949add01fe41..ce3c9ae4859be430633ba6b629edafe94bde79e3 100644 (file)
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -54,7 +54,7 @@ public:
                AGAIN
        };
 
-       std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> get_video (Error* e = 0);
+       std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> get_video (bool blocking, Error* e = 0);
        boost::optional<dcpomatic::DCPTime> get_audio (float* out, Frame frames);
        boost::optional<TextRingBuffers::Data> get_closed_caption ();
 
@@ -73,14 +73,8 @@ private:
        void seek_unlocked (dcpomatic::DCPTime position, bool accurate);
 
        boost::shared_ptr<Player> _player;
-       boost::thread* _thread;
+       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;
@@ -89,7 +83,7 @@ private:
        boost::asio::io_service _prepare_service;
        boost::shared_ptr<boost::asio::io_service::work> _prepare_work;
 
-       /** mutex to protect _pending_seek_position, _pending_seek_acurate, _finished, _died, _stop_thread */
+       /** mutex to protect _pending_seek_position, _pending_seek_accurate, _finished, _died, _stop_thread */
        boost::mutex _mutex;
        boost::condition _summon;
        boost::condition _arrived;