X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.h;h=28d6aa4bbf6b6d8118cd88784ce799066bd7157c;hb=b6c780d3107557d452c6612d715d01e2be52dbda;hp=2ecf3c87f449135756c21e280c439cc63abeb6ce;hpb=2499c41097f8410cb3016e095a85d68979485a7b;p=dcpomatic.git

diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index 2ecf3c87f..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,44 +17,53 @@
 
 */
 
+/** @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"
-#include "film_editor_panel.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 (boost::shared_ptr<Content>, int);
+	void film_content_changed (int);
+	void content_selection_changed ();
 
 private:
-	void left_crop_changed ();
-	void right_crop_changed ();
-	void top_crop_changed ();
-	void bottom_crop_changed ();
 	void edit_filters_clicked ();
-	void ratio_changed ();
-	void frame_type_changed ();
+	void enable_colour_conversion_clicked ();
 	void edit_colour_conversion_clicked ();
+	void fade_in_changed ();
+	void fade_out_changed ();
 
 	void setup_description ();
 
-	wxChoice* _frame_type;
-	wxSpinCtrl* _left_crop;
-	wxSpinCtrl* _right_crop;
-	wxSpinCtrl* _top_crop;
-	wxSpinCtrl* _bottom_crop;
-	wxChoice* _ratio;
-	wxStaticText* _ratio_description;
+	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;
+	wxCheckBox* _enable_colour_conversion;
 	wxStaticText* _colour_conversion;
 	wxButton* _colour_conversion_button;
 };