X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.h;h=2e394e4fc7af4b68aab25e7d97cad7b1c3894d22;hb=31de5b1272d928557a7272977584f5dcc9876c75;hp=795a52a78f2cfa33c5227a3dcb93efaf84a23ed6;hpb=401af8742fe5b2bb3ec117acdc4b0b36bc8f5047;p=dcpomatic.git

diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index 795a52a78..2e394e4fc 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.
@@ -47,12 +47,21 @@ public:
 
 private:
 	void reference_clicked ();
-	void edit_filters_clicked ();
 	void colour_conversion_changed ();
 	void edit_colour_conversion_clicked ();
+	void range_changed ();
 	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 ();
@@ -61,25 +70,32 @@ private:
 	wxStaticText* _reference_note;
 	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<ContentTime>* _fade_in;
+	Timecode<dcpomatic::ContentTime>* _fade_in;
 	wxStaticText* _fade_out_label;
-	Timecode<ContentTime>* _fade_out;
-	wxStaticText* _scale_to_label;
-	ContentChoice<VideoContent, VideoContentScale>* _scale;
+	Timecode<dcpomatic::ContentTime>* _fade_out;
+	wxStaticText* _scale_label;
+	wxRadioButton* _scale_fit;
+	wxRadioButton* _scale_custom;
+	wxButton* _scale_custom_edit;
 	wxStaticText* _description;
-	wxStaticText* _filters_label;
-	wxStaticText* _filters;
-	wxButton* _filters_button;
 	wxStaticText* _colour_conversion_label;
 	wxChoice* _colour_conversion;
 	wxButton* _edit_colour_conversion_button;
+	wxStaticText* _range_label;
+	wxChoice* _range;
+
+	bool _left_changed_last = true;
+	bool _top_changed_last = true;
 };