Merge master.

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

diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index 16ecb7e2ed6ecec629d65f7d471b38a4bdc51d4c..28d6aa4bbf6b6d8118cd88784ce799066bd7157c 100644 (file)
--- 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);
@@ -39,6 +47,8 @@ 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 ();
 
@@ -47,6 +57,8 @@ 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;