X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.h;h=fb1f98b29777c83be18ed45fb1774efa6c029949;hb=72eedf0b240c71b9dbd27d1f95b109b48e3200a2;hp=4bd526d499d0cd1c7d85c7425f64991211d17da7;hpb=594af3389df908a387a0e15f4a49a288e363def0;p=dcpomatic.git

diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index 4bd526d49..fb1f98b29 100644
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -19,6 +19,7 @@
 
 #include "lib/film.h"
 #include "film_editor_panel.h"
+#include "content_widget.h"
 
 class wxChoice;
 class wxStaticText;
@@ -31,27 +32,25 @@ public:
 	VideoPanel (FilmEditor *);
 
 	void film_changed (Film::Property);
-	void film_content_changed (boost::shared_ptr<Content>, int);
+	void film_content_changed (int);
+	void content_selection_changed ();
 
 private:
-	void left_crop_changed ();
-	void right_crop_changed ();
-	void top_crop_changed ();
-	void bottom_crop_changed ();
 	void edit_filters_clicked ();
-	void ratio_changed ();
-	void frame_type_changed ();
+	void edit_colour_conversion_clicked ();
 
-	void setup_scaling_description ();
+	void setup_description ();
 
-	wxChoice* _frame_type;
-	wxSpinCtrl* _left_crop;
-	wxSpinCtrl* _right_crop;
-	wxSpinCtrl* _top_crop;
-	wxSpinCtrl* _bottom_crop;
-	wxChoice* _ratio;
+	ContentChoice<VideoContent, VideoFrameType>* _frame_type;
+	ContentSpinCtrl<VideoContent>*               _left_crop;
+	ContentSpinCtrl<VideoContent>*               _right_crop;
+	ContentSpinCtrl<VideoContent>*               _top_crop;
+	ContentSpinCtrl<VideoContent>*               _bottom_crop;
+	ContentChoice<VideoContent, Ratio const *>*  _ratio;
 	wxStaticText* _ratio_description;
-	wxStaticText* _scaling_description;
+	wxStaticText* _description;
 	wxStaticText* _filters;
 	wxButton* _filters_button;
+	wxStaticText* _colour_conversion;
+	wxButton* _colour_conversion_button;
 };