Change re{set,fresh}_metadata to take a film and a size from the player.

[dcpomatic.git] / src / wx / video_view.h

diff --git a/src/wx/video_view.h b/src/wx/video_view.h
index ad492bd435fec51707c7786239c2a96ddd9c3580..ef5e8107d508bdb46785cb3de521228950902cd7 100644 (file)
--- a/src/wx/video_view.h
+++ b/src/wx/video_view.h
@@ -33,6 +33,7 @@
 class Image;
 class wxWindow;
 class FilmViewer;
+class Player;
 class PlayerVideo;
 
 class VideoView : public ExceptionStore, public boost::noncopyable
@@ -53,7 +54,7 @@ public:
        virtual bool display_next_frame (bool) = 0;
 
        void clear ();
-       bool refresh_metadata (boost::shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size);
+       bool refresh_metadata (boost::shared_ptr<const Film> film, dcp::Size player_video_container_size);
 
        /** Emitted from the GUI thread when our display changes in size */
        boost::signals2::signal<void()> Sized;
@@ -66,6 +67,11 @@ public:
                return _dropped;
        }
 
+       int errored () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _errored;
+       }
+
        int gets () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _gets;
@@ -107,7 +113,7 @@ public:
 
 protected:
        bool get_next_frame (bool non_blocking);
-       int time_until_next_frame () const;
+       boost::optional<int> time_until_next_frame () const;
        dcpomatic::DCPTime one_video_frame () const;
 
        int video_frame_rate () const {
@@ -137,12 +143,6 @@ protected:
 
        FilmViewer* _viewer;
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       bool _in_watermark;
-       int _watermark_x;
-       int _watermark_y;
-#endif
-
        StateTimer _state_timer;
 
 private:
@@ -157,6 +157,7 @@ private:
        bool _three_d;
 
        int _dropped;
+       int _errored;
        int _gets;
 };