Change video content scaling so that it either:

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

diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index 04063ef54b179a54bcb445e30e34bc8b161bd777..22c5644828ab9de26594398cbd80f6e8745ab645 100644 (file)
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -25,7 +25,6 @@
 #include "content_sub_panel.h"
 #include "content_widget.h"
 #include "timecode.h"
 #include "content_sub_panel.h"
 #include "content_widget.h"
 #include "timecode.h"

-#include "lib/video_content_scale.h"

 #include "lib/film.h"
 
 class wxChoice;
 #include "lib/film.h"
 
 class wxChoice;


@@ -55,6 +54,9 @@ private:
        void fade_in_changed ();
        void fade_out_changed ();
        void add_to_grid ();
        void fade_in_changed ();
        void fade_out_changed ();
        void add_to_grid ();

+       void scale_fit_clicked ();
+       void scale_custom_clicked ();
+       bool scale_custom_edit_clicked ();

 
        void setup_description ();
        void setup_sensitivity ();
 
        void setup_description ();
        void setup_sensitivity ();


@@ -77,8 +79,10 @@ private:
        Timecode<dcpomatic::ContentTime>* _fade_in;
        wxStaticText* _fade_out_label;
        Timecode<dcpomatic::ContentTime>* _fade_out;
        Timecode<dcpomatic::ContentTime>* _fade_in;
        wxStaticText* _fade_out_label;
        Timecode<dcpomatic::ContentTime>* _fade_out;

-       wxStaticText* _scale_to_label;
-       ContentChoice<VideoContent, VideoContentScale>* _scale;
+       wxStaticText* _scale_label;
+       wxRadioButton* _scale_fit;
+       wxRadioButton* _scale_custom;
+       wxButton* _scale_custom_edit;

        wxStaticText* _description;
        wxStaticText* _filters_label;
        wxStaticText* _filters;
        wxStaticText* _description;
        wxStaticText* _filters_label;
        wxStaticText* _filters;