Add support for no-scale of the input video.

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

diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index 51a593e751921b5f9c372f4efcbb09cfd3525042..99633491d835ea9948538ad696459035e5f16876 100644 (file)
--- 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,24 @@ 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 (wxCommandEvent &);
-       void right_crop_changed (wxCommandEvent &);
-       void top_crop_changed (wxCommandEvent &);
-       void bottom_crop_changed (wxCommandEvent &);
-       void edit_filters_clicked (wxCommandEvent &);
-       void ratio_changed (wxCommandEvent &);
-       void frame_type_changed ();
-
-       void setup_scaling_description ();
-
-       wxChoice* _frame_type;
-       wxSpinCtrl* _left_crop;
-       wxSpinCtrl* _right_crop;
-       wxSpinCtrl* _top_crop;
-       wxSpinCtrl* _bottom_crop;
-       wxChoice* _ratio;
-       wxStaticText* _ratio_description;
-       wxStaticText* _scaling_description;
+       void edit_filters_clicked ();
+       void edit_colour_conversion_clicked ();
+
+       void setup_description ();
+
+       ContentChoice<VideoContent, VideoFrameType>*    _frame_type;
+       ContentSpinCtrl<VideoContent>*                  _left_crop;
+       ContentSpinCtrl<VideoContent>*                  _right_crop;
+       ContentSpinCtrl<VideoContent>*                  _top_crop;
+       ContentSpinCtrl<VideoContent>*                  _bottom_crop;
+       ContentChoice<VideoContent, VideoContentScale>* _scale;
+       wxStaticText* _description;
        wxStaticText* _filters;
        wxButton* _filters_button;
+       wxStaticText* _colour_conversion;
+       wxButton* _colour_conversion_button;
 };