X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.h;h=22c5644828ab9de26594398cbd80f6e8745ab645;hb=15a83d720780d58f905d40f8493cdcb86596eaee;hp=b4b4c77662f1fcff662f8d1db2b986ffbef12580;hpb=4704d088ae03ab2b5f73ceed577fd84935ad0640;p=dcpomatic.git

diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index b4b4c7766..22c564482 100644
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -24,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;
@@ -38,32 +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 ();
 
-	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;
+	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;
+	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;
 };