Merge master into direct-mxf.

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

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 07ef2431e1bfe3b5361763d2473011093a9f4ad1..90be752d832a84d20611a9164016294bcab53607 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -46,7 +46,8 @@ public:
        boost::signals2::signal<void (std::string)> FileChanged;
 
 private:
-       void make_general_panel ();
+       void make_film_panel ();
+       void make_video_panel ();
        void make_audio_panel ();
        void make_subtitle_panel ();
        void connect_to_widgets ();
@@ -60,9 +61,10 @@ private:
        void top_crop_changed (wxCommandEvent &);
        void bottom_crop_changed (wxCommandEvent &);
        void content_changed (wxCommandEvent &);
+       void trust_content_header_changed (wxCommandEvent &);
        void format_changed (wxCommandEvent &);
-       void dcp_trim_start_changed (wxCommandEvent &);
-       void dcp_trim_end_changed (wxCommandEvent &);
+       void trim_start_changed (wxCommandEvent &);
+       void trim_end_changed (wxCommandEvent &);
        void dcp_content_type_changed (wxCommandEvent &);
        void dcp_ab_toggled (wxCommandEvent &);
        void scaler_changed (wxCommandEvent &);
@@ -72,20 +74,24 @@ private:
        void with_subtitles_toggled (wxCommandEvent &);
        void subtitle_offset_changed (wxCommandEvent &);
        void subtitle_scale_changed (wxCommandEvent &);
+       void colour_lut_changed (wxCommandEvent &);
+       void j2k_bandwidth_changed (wxCommandEvent &);
        void still_duration_changed (wxCommandEvent &);
        void audio_stream_changed (wxCommandEvent &);
        void subtitle_stream_changed (wxCommandEvent &);
+       void use_audio_changed (wxCommandEvent &);
+       void external_audio_changed (wxCommandEvent &);
 
        /* Handle changes to the model */
        void film_changed (Film::Property);
 
        /* Button clicks */
        void edit_filters_clicked (wxCommandEvent &);
-       void change_dcp_range_clicked (wxCommandEvent &);
 
        void set_things_sensitive (bool);
        void setup_formats ();
        void setup_subtitle_control_sensitivity ();
+       void setup_audio_control_sensitivity ();
        void setup_streams ();
        void setup_audio_details ();
        
@@ -95,8 +101,10 @@ private:
        void active_jobs_changed (bool);
 
        wxNotebook* _notebook;
-       wxPanel* _general_panel;
-       wxSizer* _general_sizer;
+       wxPanel* _film_panel;
+       wxSizer* _film_sizer;
+       wxPanel* _video_panel;
+       wxSizer* _video_sizer;
        wxPanel* _audio_panel;
        wxSizer* _audio_sizer;
        wxPanel* _subtitle_panel;
@@ -110,9 +118,10 @@ private:
        wxCheckBox* _use_dci_name;
        wxButton* _edit_dci_button;
        /** The Film's format */
-       wxComboBox* _format;
+       wxChoice* _format;
        /** The Film's content file */
        wxFilePickerCtrl* _content;
+       wxCheckBox* _trust_content_header;
        /** The Film's left crop */
        wxSpinCtrl* _left_crop;
        /** The Film's right crop */
@@ -126,8 +135,11 @@ private:
        /** Button to open the filters dialogue */
        wxButton* _filters_button;
        /** The Film's scaler */
-       wxComboBox* _scaler;
-       wxComboBox* _audio_stream;
+       wxChoice* _scaler;
+       wxRadioButton* _use_content_audio;
+       wxChoice* _audio_stream;
+       wxRadioButton* _use_external_audio;
+       wxFilePickerCtrl* _external_audio[MAX_AUDIO_CHANNELS];
        /** The Film's audio gain */
        wxSpinCtrl* _audio_gain;
        /** A button to open the gain calculation dialogue */
@@ -135,11 +147,13 @@ private:
        /** The Film's audio delay */
        wxSpinCtrl* _audio_delay;
        wxCheckBox* _with_subtitles;
-       wxComboBox* _subtitle_stream;
+       wxChoice* _subtitle_stream;
        wxSpinCtrl* _subtitle_offset;
        wxSpinCtrl* _subtitle_scale;
+       wxChoice* _colour_lut;
+       wxSpinCtrl* _j2k_bandwidth;
        /** The Film's DCP content type */
-       wxComboBox* _dcp_content_type;
+       wxChoice* _dcp_content_type;
        /** The Film's frames per second */
        wxStaticText* _frames_per_second;
        /** The Film's original size */
@@ -151,8 +165,8 @@ private:
        /** The Film's duration for still sources */
        wxSpinCtrl* _still_duration;
 
-       wxSpinCtrl* _dcp_trim_start;
-       wxSpinCtrl* _dcp_trim_end;
+       wxSpinCtrl* _trim_start;
+       wxSpinCtrl* _trim_end;
        /** Selector to generate an A/B comparison DCP */
        wxCheckBox* _dcp_ab;