Merge remote-tracking branch 'origin/master' into 2.0

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

diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index 2f0c97cb7643f399fbfbd4635972ae39d41b990a..e17541cd3f8ef3f565549cd7e6564a949e842da0 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,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);
@@ -41,12 +48,12 @@ private:
 
        void setup_description ();
 
-       ContentChoice<VideoContent, VideoFrameType>* _frame_type;
-       ContentSpinCtrl<VideoContent>*               _left_crop;
-       ContentSpinCtrl<VideoContent>*               _right_crop;
-       ContentSpinCtrl<VideoContent>*               _top_crop;
-       ContentSpinCtrl<VideoContent>*               _bottom_crop;
-       ContentChoice<VideoContent, Ratio const *>*  _ratio;
+       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;