X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.h;h=d90612fdda0fe7d8a37118e5d4998682c877f3aa;hb=92b6430402753a572c33d594ba0745a4e461edf4;hp=4331a97128bea83daba8749ec4d1f6a73f7da532;hpb=73f52e94953848c696725defd3d7f5c4c30707e2;p=dcpomatic.git

diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index 4331a9712..d90612fdd 100644
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -1,5 +1,5 @@
 /*
-    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
     it under the terms of the GNU General Public License as published by
@@ -21,9 +21,10 @@
  *  @brief VideoPanel class.
  */
 
-#include "lib/film.h"
-#include "film_editor_panel.h"
+#include "content_sub_panel.h"
 #include "content_widget.h"
+#include "timecode.h"
+#include "lib/film.h"
 
 class wxChoice;
 class wxStaticText;
@@ -33,10 +34,10 @@ class wxButton;
 /** @class VideoPanel
  *  @brief The video tab of the film editor.
  */
-class VideoPanel : public FilmEditorPanel
+class VideoPanel : public ContentSubPanel
 {
 public:
-	VideoPanel (FilmEditor *);
+	VideoPanel (ContentPanel *);
 
 	void film_changed (Film::Property);
 	void film_content_changed (int);
@@ -44,7 +45,10 @@ public:
 
 private:
 	void edit_filters_clicked ();
+	void colour_conversion_changed ();
 	void edit_colour_conversion_clicked ();
+	void fade_in_changed ();
+	void fade_out_changed ();
 
 	void setup_description ();
 
@@ -53,10 +57,12 @@ 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;
-	wxStaticText* _colour_conversion;
-	wxButton* _colour_conversion_button;
+	wxChoice* _colour_conversion;
+	wxButton* _edit_colour_conversion_button;
 };