Barely-functioning GL playback with new arrangement.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index d0041bd957e6394d62acdc1b79f995a7b43006a9..a59468c363579ab8a6d7d92c74c5fe47c2095e4b 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -119,7 +119,7 @@ public:
                return _gets;
        }
 
-       /* Some accessors that VideoView classes need */
+       /* Some accessors and utility methods that VideoView classes need */
        dcp::Size out_size () const {
                return _out_size;
        }
@@ -135,6 +135,10 @@ public:
        bool pad_black () const {
                return _pad_black;
        }
+       boost::shared_ptr<Butler> butler () const {
+               return _butler;
+       }
+       int time_until_next_frame () const;
 
        boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
        boost::signals2::signal<void ()> PositionChanged;
@@ -149,14 +153,14 @@ 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);
-       bool get (bool lazy);
        void idle_handler ();
        void request_idle_get ();
-       void display_player_video ();
        void film_change (ChangeType, Film::Property);
        void recreate_butler ();
        void config_changed (Config::Property);
@@ -175,7 +179,6 @@ private:
        bool _coalesce_player_changes;
        std::list<int> _pending_player_changes;
 
-       std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
        dcpomatic::DCPTime _video_position;
        Position<int> _inter_position;
        dcp::Size _inter_size;