X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.h;h=e17541cd3f8ef3f565549cd7e6564a949e842da0;hb=40b654453c2ce0b266f43c36f1b9a5d1705f983c;hp=577bbf0e77e8a210472e5111812571757ce3e901;hpb=1415214ff18e05e5b609aab8c4efb89e5b9e0cc0;p=dcpomatic.git

diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index 577bbf0e7..e17541cd3 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,8 +17,12 @@
 
 */
 
+/** @file  src/lib/video_panel.h
+ *  @brief VideoPanel class.
+ */
+
 #include "lib/film.h"
-#include "film_editor_panel.h"
+#include "content_sub_panel.h"
 #include "content_widget.h"
 
 class wxChoice;
@@ -26,10 +30,13 @@ 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,18 +44,16 @@ public:
 
 private:
 	void edit_filters_clicked ();
-	void ratio_changed ();
 	void edit_colour_conversion_clicked ();
 
 	void setup_description ();
 
-	ContentChoice<VideoContent, VideoFrameType>* _frame_type;
-	ContentSpinCtrl<VideoContent>*               _left_crop;
-	ContentSpinCtrl<VideoContent>*               _right_crop;
-	ContentSpinCtrl<VideoContent>*               _top_crop;
-	ContentSpinCtrl<VideoContent>*               _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;
+	ContentChoice<VideoContent, VideoContentScale>* _scale;
 	wxStaticText* _description;
 	wxStaticText* _filters;
 	wxButton* _filters_button;