Use glTexSubImage2D when possible, as suggested by https://www.khronos.org/opengl...

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 21195e74761cf1dd42305feaa833d855df57e8ae..60cde60d00139b10fb6a6546995e1eca66b50196 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -92,7 +92,11 @@ public:
 
        void slow_refresh ();
 
+       dcpomatic::DCPTime time () const;
+       boost::optional<dcpomatic::DCPTime> audio_time () const;
+
        int dropped () const;
+       int gets () const;
 
        int audio_callback (void* out, unsigned int frames);
 
@@ -107,10 +111,6 @@ public:
        }
 #endif
 
-       int gets () const {
-               return _gets;
-       }
-
        StateTimer const & state_timer () const {
                return _video_view->state_timer ();
        }
@@ -131,23 +131,18 @@ public:
        ClosedCaptionsDialog* closed_captions_dialog () const {
                return _closed_captions_dialog;
        }
+       void finished ();
 
        boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
        boost::signals2::signal<void (dcpomatic::DCPTime)> Started;
        boost::signals2::signal<void (dcpomatic::DCPTime)> Stopped;
        /** While playing back we reached the end of the film (emitted from GUI thread) */
        boost::signals2::signal<void ()> Finished;
-       void emit_finished ();
 
        boost::signals2::signal<bool ()> PlaybackPermitted;
 
 private:
 
-       /* XXX_b: to remove */
-       friend class SimpleVideoView;
-       friend class GLVideoView;
-       friend class VideoView;
-
        void video_view_sized ();
        void calculate_sizes ();
        void player_change (ChangeType type, int, bool);
@@ -157,9 +152,8 @@ private:
        void recreate_butler ();
        void config_changed (Config::Property);
        void film_length_change ();
+       void ui_finished ();
 
-       dcpomatic::DCPTime time () const;
-       boost::optional<dcpomatic::DCPTime> audio_time () const;
        dcpomatic::DCPTime uncorrected_time () const;
        Frame average_latency () const;
 
@@ -192,7 +186,6 @@ private:
        ClosedCaptionsDialog* _closed_captions_dialog;
 
        bool _outline_content;
-       Eyes _eyes;
        /** true to pad the viewer panel with black, false to use
            the normal window background colour.
        */
@@ -202,8 +195,6 @@ private:
        bool _background_image;
 #endif
 
-       int _gets;
-
        /** true if an get() is required next time we are idle */
        bool _idle_get;