Fixes for wx 2.8.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index dbaf8eee268167d558dd9d05c9ee402b1fdce09b..456301eb4e0744d9162e60781e7034bf2ad90c4b 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -48,7 +48,7 @@ private:
        void slider_moved (wxScrollEvent &);
        void play_clicked (wxCommandEvent &);
        void timer (wxTimerEvent &);
-       void process_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
+       void process_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>);
        void calculate_sizes ();
        void check_play_state ();
        void update_from_raw ();
@@ -58,7 +58,8 @@ private:
        void active_jobs_changed (bool);
 
        boost::shared_ptr<Film> _film;
-       
+
+       wxSizer* _v_sizer;
        wxPanel* _panel;
        wxSlider* _slider;
        wxToggleButton* _play_button;
@@ -68,11 +69,17 @@ private:
        boost::shared_ptr<Image> _raw_frame;
        boost::shared_ptr<Subtitle> _raw_sub;
        boost::shared_ptr<Image> _display_frame;
+       int _display_frame_x;
        boost::shared_ptr<RGBPlusAlphaImage> _display_sub;
        Position _display_sub_position;
+       bool _got_frame;
+
+       /** Size of our output (including padding if we have any) */
+       libdcp::Size _out_size;
+       /** Size that we will make our film (equal to _out_size unless we have padding) */
+       libdcp::Size _film_size;
+       /** Size of the panel that we have available */
+       libdcp::Size _panel_size;
 
-       int _out_width;
-       int _out_height;
-       int _panel_width;
-       int _panel_height;
+       bool _clear_required;
 };