Merge master.

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

diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index 4331a97128bea83daba8749ec4d1f6a73f7da532..28d6aa4bbf6b6d8118cd88784ce799066bd7157c 100644 (file)
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -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 enable_colour_conversion_clicked ();
        void edit_colour_conversion_clicked ();
+       void fade_in_changed ();
+       void fade_out_changed ();
 
        void setup_description ();
 
@@ -53,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;
 };