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 5ddb12bafd0e2045422c60a3a98c2efd6682f286..a59468c363579ab8a6d7d92c74c5fe47c2095e4b 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -75,6 +75,8 @@ public:
 
        void start ();
        bool stop ();
+       void suspend ();
+       void resume ();
        bool playing () const {
                return _playing;
        }
@@ -117,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;
        }
@@ -133,9 +135,10 @@ public:
        bool pad_black () const {
                return _pad_black;
        }
-       dcpomatic::DCPTime video_position () const {
-               return _video_position;
+       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;
@@ -147,12 +150,17 @@ public:
        boost::signals2::signal<bool ()> PlaybackPermitted;
 
 private:
+
+       /* XXX_b: to remove */
+       friend class SimpleVideoView;
+       friend class GLVideoView;
+       friend class VideoView;
+
        void video_view_sized ();
-       void timer ();
        void calculate_sizes ();
        void player_change (ChangeType type, int, bool);
-       void get ();
-       void display_player_video ();
+       void idle_handler ();
+       void request_idle_get ();
        void film_change (ChangeType, Film::Property);
        void recreate_butler ();
        void config_changed (Config::Property);
@@ -168,11 +176,9 @@ private:
        boost::shared_ptr<Player> _player;
 
        VideoView* _video_view;
-       wxTimer _timer;
        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;
@@ -184,6 +190,7 @@ private:
        int _audio_channels;
        unsigned int _audio_block_size;
        bool _playing;
+       int _suspended;
        boost::shared_ptr<Butler> _butler;
 
        std::list<Frame> _latency_history;
@@ -210,5 +217,8 @@ private:
        StateTimer _state_timer;
        int _gets;
 
+       /** true if an get() is required next time we are idle */
+       bool _idle_get;
+
        boost::signals2::scoped_connection _config_changed_connection;
 };