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 93ca26da35fc32460ca7e95de4d75200879c1490..a59468c363579ab8a6d7d92c74c5fe47c2095e4b 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -53,6 +53,10 @@ public:
                return _video_view->get();
        }
 
+       VideoView const * video_view () const {
+               return _video_view;
+       }
+
        void show_closed_captions ();
 
        void set_film (boost::shared_ptr<Film>);
@@ -71,6 +75,8 @@ public:
 
        void start ();
        bool stop ();
+       void suspend ();
+       void resume ();
        bool playing () const {
                return _playing;
        }
@@ -93,7 +99,11 @@ public:
 #ifdef DCPOMATIC_VARIANT_SWAROOP
        void set_background_image (bool b) {
                _background_image = b;
-               refresh_panel ();
+               refresh_view ();
+       }
+
+       bool background_image () const {
+               return _background_image;
        }
 #endif
 
@@ -101,10 +111,35 @@ public:
                return _state_timer;
        }
 
+       StateTimer& state_timer () {
+               return _state_timer;
+       }
+
        int gets () const {
                return _gets;
        }
 
+       /* 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;
+       }
+       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;
        boost::signals2::signal<void (dcpomatic::DCPTime)> Started;
@@ -115,16 +150,20 @@ 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);
-       bool maybe_draw_background_image (wxPaintDC& dc);
 
        dcpomatic::DCPTime time () const;
        dcpomatic::DCPTime uncorrected_time () const;
@@ -137,12 +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;
-       boost::shared_ptr<const Image> _frame;
        dcpomatic::DCPTime _video_position;
        Position<int> _inter_position;
        dcp::Size _inter_size;
@@ -154,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;
@@ -174,14 +211,14 @@ private:
        bool _pad_black;
 
 #ifdef DCPOMATIC_VARIANT_SWAROOP
-       bool _in_watermark;
-       int _watermark_x;
-       int _watermark_y;
        bool _background_image;
 #endif
 
        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;
 };