Restore checking of 2D files that are incorrectly set as 3D.

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

diff --git a/src/lib/butler.h b/src/lib/butler.h
index f1922d3481efedbd418c74e731ae2328d54cee84..ea43374434f033a5becfebc13f2fce09a6436d5c 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 ();
 
@@ -69,18 +69,12 @@ private:
        void text (PlayerText pt, TextType type, boost::optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period);
        bool should_run () const;
        void prepare (boost::weak_ptr<PlayerVideo> video);
-       void player_change (ChangeType type, bool frequent);
+       void player_change (ChangeType type);
        void seek_unlocked (dcpomatic::DCPTime position, bool accurate);
 
        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;