Restore paint-panel timing.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 8b88638cc73da316d46e6bd7222216f3921792a0..450111bc4e6b96c6b765f8841c04cd34099f6664 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -101,10 +101,31 @@ public:
                return _state_timer;
        }
 
+       StateTimer& state_timer () {
+               return _state_timer;
+       }
+
        int gets () const {
                return _gets;
        }
 
+       /* Some accessors that VideoView classes need */
+       dcp::Size out_size () const {
+               return _out_size;
+       }
+       dcp::Size inter_size () const {
+               return _inter_size;
+       }
+       Position<int> inter_position () const {
+               return _inter_position;
+       }
+       bool outline_content () const {
+               return _outline_content;
+       }
+       bool pad_black () const {
+               return _pad_black;
+       }
+
        boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
        boost::signals2::signal<void ()> PositionChanged;
        boost::signals2::signal<void (dcpomatic::DCPTime)> Started;
@@ -130,7 +151,7 @@ private:
        dcpomatic::DCPTime uncorrected_time () const;
        Frame average_latency () const;
 
-       void refresh_panel ();
+       void refresh_view ();
        bool quick_refresh ();
 
        boost::shared_ptr<Film> _film;
@@ -142,7 +163,6 @@ private:
        std::list<int> _pending_player_changes;
 
        std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
-       boost::shared_ptr<const Image> _frame;
        dcpomatic::DCPTime _video_position;
        Position<int> _inter_position;
        dcp::Size _inter_size;