X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.h;h=28d6aa4bbf6b6d8118cd88784ce799066bd7157c;hb=258da8a37c21a87ba5a7aa1c3e6243280d5c8d10;hp=99633491d835ea9948538ad696459035e5f16876;hpb=a79d78d8bb6d51f6662f1f63b9f8fd19e1a0c5f1;p=dcpomatic.git

diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index 99633491d..28d6aa4bb 100644
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,19 +17,27 @@
 
 */
 
-#include "lib/film.h"
-#include "film_editor_panel.h"
+/** @file  src/lib/video_panel.h
+ *  @brief VideoPanel class.
+ */
+
+#include "content_sub_panel.h"
 #include "content_widget.h"
+#include "timecode.h"
+#include "lib/film.h"
 
 class wxChoice;
 class wxStaticText;
 class wxSpinCtrl;
 class wxButton;
 
-class VideoPanel : public FilmEditorPanel
+/** @class VideoPanel
+ *  @brief The video tab of the film editor.
+ */
+class VideoPanel : public ContentSubPanel
 {
 public:
-	VideoPanel (FilmEditor *);
+	VideoPanel (ContentPanel *);
 
 	void film_changed (Film::Property);
 	void film_content_changed (int);
@@ -37,7 +45,10 @@ public:
 
 private:
 	void edit_filters_clicked ();
+	void enable_colour_conversion_clicked ();
 	void edit_colour_conversion_clicked ();
+	void fade_in_changed ();
+	void fade_out_changed ();
 
 	void setup_description ();
 
@@ -46,10 +57,13 @@ private:
 	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;
+	wxCheckBox* _enable_colour_conversion;
 	wxStaticText* _colour_conversion;
 	wxButton* _colour_conversion_button;
 };