Change video content scaling so that it either:

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

diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index c405822be59d14c5c2b9bc0754adf7152c55cdf1..22c5644828ab9de26594398cbd80f6e8745ab645 100644 (file)
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -25,7 +25,6 @@
 #include "content_sub_panel.h"
 #include "content_widget.h"
 #include "timecode.h"
-#include "lib/video_content_scale.h"
 #include "lib/film.h"
 
 class wxChoice;
@@ -39,35 +38,58 @@ class wxButton;
 class VideoPanel : public ContentSubPanel
 {
 public:
-       VideoPanel (ContentPanel *);
+       explicit VideoPanel (ContentPanel *);
 
        void film_changed (Film::Property);
        void film_content_changed (int);
        void content_selection_changed ();
 
 private:
+       void use_clicked ();
        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 setup_description ();
        void setup_sensitivity ();
 
        wxCheckBox* _reference;
-       ContentChoice<VideoContent, VideoFrameType>*    _frame_type;
-       ContentSpinCtrl<VideoContent>*                  _left_crop;
-       ContentSpinCtrl<VideoContent>*                  _right_crop;
-       ContentSpinCtrl<VideoContent>*                  _top_crop;
-       ContentSpinCtrl<VideoContent>*                  _bottom_crop;
-       Timecode<ContentTime>*                          _fade_in;
-       Timecode<ContentTime>*                          _fade_out;
-       ContentChoice<VideoContent, VideoContentScale>* _scale;
+       wxStaticText* _reference_note;
+       wxCheckBox* _use;
+       wxStaticText* _type_label;
+       ContentChoice<VideoContent, VideoFrameType>* _frame_type;
+       wxStaticText* _crop_label;
+       wxStaticText* _left_crop_label;
+       ContentSpinCtrl<VideoContent>* _left_crop;
+       wxStaticText* _right_crop_label;
+       ContentSpinCtrl<VideoContent>* _right_crop;
+       wxStaticText* _top_crop_label;
+       ContentSpinCtrl<VideoContent>* _top_crop;
+       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_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;
 };