Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic

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

diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index fb1f98b29777c83be18ed45fb1774efa6c029949..99633491d835ea9948538ad696459035e5f16876 100644 (file)
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -41,13 +41,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;
-       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;