X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=784434f6b60c2a198ce4c29edbd97575eba5b475;hb=e32d1c52f8f8e7cad145766b9b33bb9c3470a6c0;hp=77f014aab63fec10640968ff72f51c17632d6fcc;hpb=58bf77268a8e82e73d7f17ab2fe6dcd29370ade3;p=dcpomatic.git

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 77f014aab..784434f6b 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -59,7 +59,7 @@ private:
 
 	boost::shared_ptr<Film> _film;
 
-	wxBoxSizer* _v_sizer;
+	wxSizer* _v_sizer;
 	wxPanel* _panel;
 	wxSlider* _slider;
 	wxToggleButton* _play_button;
@@ -69,12 +69,18 @@ private:
 	boost::shared_ptr<Image> _raw_frame;
 	boost::shared_ptr<Subtitle> _raw_sub;
 	boost::shared_ptr<Image> _display_frame;
+	/* The x offset at which we display the actual film content; this corresponds
+	   to the film's padding converted to our coordinates.
+	*/
+	int _display_frame_x;
 	boost::shared_ptr<RGBPlusAlphaImage> _display_sub;
 	Position _display_sub_position;
 	bool _got_frame;
 
-	int _out_width;
-	int _out_height;
-	int _panel_width;
-	int _panel_height;
+	/** 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;
 };