Merge branch 'master' into plot-audio

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

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 7e75b4bf00841fbcd766778471a989f7f81ec425..2af747bb0447f35e2d4e666626f5f8c4b37173f1 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -29,8 +29,8 @@
 #include "lib/film.h"
 
 class wxNotebook;
-
 class Film;
+class AudioDialog;
 
 /** @class FilmEditor
  *  @brief A wx widget to edit a film's metadata, and perform various functions.
@@ -63,17 +63,20 @@ private:
        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 &);
        void audio_gain_changed (wxCommandEvent &);
        void audio_gain_calculate_button_clicked (wxCommandEvent &);
+       void show_audio_clicked (wxCommandEvent &);
        void audio_delay_changed (wxCommandEvent &);
        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 &);
@@ -92,6 +95,7 @@ private:
        void setup_audio_control_sensitivity ();
        void setup_streams ();
        void setup_audio_details ();
+       void setup_dcp_name ();
        
        wxControl* video_control (wxControl *);
        wxControl* still_control (wxControl *);
@@ -116,7 +120,7 @@ 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;
@@ -133,23 +137,26 @@ private:
        /** Button to open the filters dialogue */
        wxButton* _filters_button;
        /** The Film's scaler */
-       wxComboBox* _scaler;
+       wxChoice* _scaler;
        wxRadioButton* _use_content_audio;
-       wxComboBox* _audio_stream;
+       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 */
        wxButton* _audio_gain_calculate_button;
+       wxButton* _show_audio;
        /** 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 */
@@ -161,8 +168,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;
 
@@ -172,4 +179,5 @@ private:
        std::vector<Format const *> _formats;
 
        bool _generally_sensitive;
+       AudioDialog* _audio_dialog;
 };