X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.h;h=b74318f2f6cc8514af42cb600cfb782ce8ae879a;hp=ad0ba402a763e4a23a9216dc1fc9a80acce45b5a;hb=d9ab996fa416ba27b69bb65f047a1a1aa4063f1b;hpb=b68fb4c103b5580509070c7733d3ae7deb46c3ce

diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index ad0ba402a..b74318f2f 100644
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -25,13 +25,13 @@
 #include "content_sub_panel.h"
 #include "content_widget.h"
 #include "timecode.h"
-#include "lib/video_content_scale.h"
 #include "lib/film.h"
 
 class wxChoice;
 class wxStaticText;
 class wxSpinCtrl;
 class wxButton;
+class wxToggleButton;
 
 /** @class VideoPanel
  *  @brief The video tab of the film editor.
@@ -46,7 +46,6 @@ public:
 	void content_selection_changed ();
 
 private:
-	void use_clicked ();
 	void reference_clicked ();
 	void edit_filters_clicked ();
 	void colour_conversion_changed ();
@@ -55,29 +54,42 @@ private:
 	void fade_in_changed ();
 	void fade_out_changed ();
 	void add_to_grid ();
+	void scale_fit_clicked ();
+	void scale_custom_clicked ();
+	bool scale_custom_edit_clicked ();
+	void left_right_link_clicked ();
+	void top_bottom_link_clicked ();
+	void left_crop_changed ();
+	void right_crop_changed ();
+	void top_crop_changed ();
+	void bottom_crop_changed ();
 
 	void setup_description ();
 	void setup_sensitivity ();
 
 	wxCheckBox* _reference;
 	wxStaticText* _reference_note;
-	wxCheckBox* _use;
 	wxStaticText* _type_label;
 	ContentChoice<VideoContent, VideoFrameType>* _frame_type;
+	wxStaticText* _crop_label;
 	wxStaticText* _left_crop_label;
 	ContentSpinCtrl<VideoContent>* _left_crop;
+	wxToggleButton* _left_right_link;
 	wxStaticText* _right_crop_label;
 	ContentSpinCtrl<VideoContent>* _right_crop;
 	wxStaticText* _top_crop_label;
 	ContentSpinCtrl<VideoContent>* _top_crop;
+	wxToggleButton* _top_bottom_link;
 	wxStaticText* _bottom_crop_label;
 	ContentSpinCtrl<VideoContent>* _bottom_crop;
 	wxStaticText* _fade_in_label;
 	Timecode<dcpomatic::ContentTime>* _fade_in;
 	wxStaticText* _fade_out_label;
 	Timecode<dcpomatic::ContentTime>* _fade_out;
-	wxStaticText* _scale_to_label;
-	ContentChoice<VideoContent, VideoContentScale>* _scale;
+	wxStaticText* _scale_label;
+	wxRadioButton* _scale_fit;
+	wxRadioButton* _scale_custom;
+	wxButton* _scale_custom_edit;
 	wxStaticText* _description;
 	wxStaticText* _filters_label;
 	wxStaticText* _filters;