Move _state_timer into VideoView.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index eaf46f1e6bbc8474bbc69020e12a0f31e950b828..0699b12ae787ec4e1f1f42443b60bf438bf972c7 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -92,9 +92,7 @@ public:
 
        void slow_refresh ();
 
-       int dropped () const {
-               return _dropped;
-       }
+       int dropped () const;
 
        int audio_callback (void* out, unsigned int frames);
 
@@ -109,28 +107,18 @@ public:
        }
 #endif
 
-       StateTimer const & state_timer () const {
-               return _state_timer;
-       }
-
-       StateTimer& state_timer () {
-               return _state_timer;
-       }
-
        int gets () const {
                return _gets;
        }
 
+       StateTimer const & state_timer () const {
+               return _video_view->state_timer ();
+       }
+
        /* Some accessors and utility methods 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;
        }
@@ -140,6 +128,9 @@ public:
        boost::shared_ptr<Butler> butler () const {
                return _butler;
        }
+       ClosedCaptionsDialog* closed_captions_dialog () const {
+               return _closed_captions_dialog;
+       }
 
        boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
        boost::signals2::signal<void (dcpomatic::DCPTime)> Started;
@@ -165,6 +156,7 @@ private:
        void film_change (ChangeType, Film::Property);
        void recreate_butler ();
        void config_changed (Config::Property);
+       void film_length_change ();
 
        dcpomatic::DCPTime time () const;
        boost::optional<dcpomatic::DCPTime> audio_time () const;
@@ -181,9 +173,6 @@ private:
        bool _coalesce_player_changes;
        std::list<int> _pending_player_changes;
 
-       Position<int> _inter_position;
-       dcp::Size _inter_size;
-
        /** Size of our output (including padding if we have any) */
        dcp::Size _out_size;
 
@@ -199,7 +188,6 @@ private:
        mutable boost::mutex _latency_history_mutex;
        int _latency_history_count;
 
-       int _dropped;
        boost::optional<int> _dcp_decode_reduction;
 
        ClosedCaptionsDialog* _closed_captions_dialog;
@@ -215,7 +203,6 @@ private:
        bool _background_image;
 #endif
 
-       StateTimer _state_timer;
        int _gets;
 
        /** true if an get() is required next time we are idle */