X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.h;h=c405822be59d14c5c2b9bc0754adf7152c55cdf1;hp=e17541cd3f8ef3f565549cd7e6564a949e842da0;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=94201bd2a5a4cb391b7f2bdeba56b928fed7cfe1

diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index e17541cd3..c405822be 100644
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 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/>.
 
 */
 
@@ -21,9 +22,11 @@
  *  @brief VideoPanel class.
  */
 
-#include "lib/film.h"
 #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;
@@ -43,20 +46,28 @@ public:
 	void content_selection_changed ();
 
 private:
+	void reference_clicked ();
 	void edit_filters_clicked ();
+	void colour_conversion_changed ();
 	void edit_colour_conversion_clicked ();
+	void fade_in_changed ();
+	void fade_out_changed ();
 
 	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* _description;
 	wxStaticText* _filters;
 	wxButton* _filters_button;
-	wxStaticText* _colour_conversion;
-	wxButton* _colour_conversion_button;
+	wxChoice* _colour_conversion;
+	wxButton* _edit_colour_conversion_button;
 };