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 8cacf80d3f050bfb79f83865e5e2f81d7d75028b..0699b12ae787ec4e1f1f42443b60bf438bf972c7 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -107,18 +107,14 @@ public:
        }
 #endif
 
        }
 #endif
 

-       StateTimer const & state_timer () const {
-               return _state_timer;
-       }
-
-       StateTimer& state_timer () {
-               return _state_timer;
-       }
-

        int gets () const {
                return _gets;
        }
 
        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;
        /* Some accessors and utility methods that VideoView classes need */
        dcp::Size out_size () const {
                return _out_size;


@@ -132,6 +128,9 @@ public:
        boost::shared_ptr<Butler> butler () const {
                return _butler;
        }
        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;
 
        boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
        boost::signals2::signal<void (dcpomatic::DCPTime)> Started;


@@ -204,7 +203,6 @@ private:
        bool _background_image;
 #endif
 
        bool _background_image;
 #endif
 

-       StateTimer _state_timer;

        int _gets;
 
        /** true if an get() is required next time we are idle */
        int _gets;
 
        /** true if an get() is required next time we are idle */