Fix thinko in previous.
[dcpomatic.git] / src / lib / butler.h
index f1922d3481efedbd418c74e731ae2328d54cee84..e5581ccb42169e6f07e555d174c348d1b49517ec 100644 (file)
@@ -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,7 +69,7 @@ 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;