No-op: remove all trailing whitespace.

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

diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h
index 060ec31ff972c55cd99830821c313de315fbdef7..055de67a61156f5310a41ec758a823693b6bfa66 100644 (file)
--- a/src/wx/dcp_panel.h
+++ b/src/wx/dcp_panel.h
@@ -31,6 +31,8 @@ class wxButton;
 class wxSpinCtrl;
 class wxSizer;
 
+class AudioDialog;
+
 class Film;
 
 class DCPPanel : public boost::noncopyable
@@ -55,7 +57,6 @@ private:
        void copy_isdcf_name_button_clicked ();
        void container_changed ();
        void dcp_content_type_changed ();
-       void scaler_changed ();
        void j2k_bandwidth_changed ();
        void frame_rate_choice_changed ();
        void frame_rate_spin_changed ();
@@ -68,10 +69,16 @@ private:
        void signed_toggled ();
        void burn_subtitles_toggled ();
        void encrypted_toggled ();
+       void edit_key_clicked ();
+       void audio_processor_changed ();
+       void show_audio_clicked ();
 
        void setup_frame_rate_widget ();
        void setup_container ();
        void setup_dcp_name ();
+       void setup_audio_channels_choice ();
+
+       int minimum_allowed_audio_channels () const;
 
        wxPanel* make_general_panel ();
        wxPanel* make_video_panel ();
@@ -87,15 +94,17 @@ private:
        wxStaticText* _dcp_name;
        wxCheckBox* _use_isdcf_name;
        wxChoice* _container;
+       wxStaticText* _container_size;
        wxButton* _edit_isdcf_button;
        wxButton* _copy_isdcf_name_button;
-       wxChoice* _scaler;
        wxSpinCtrl* _j2k_bandwidth;
        wxChoice* _dcp_content_type;
        wxChoice* _frame_rate_choice;
        wxSpinCtrl* _frame_rate_spin;
        wxSizer* _frame_rate_sizer;
-       wxSpinCtrl* _audio_channels;
+       wxChoice* _audio_channels;
+       wxChoice* _audio_processor;
+       wxButton* _show_audio;
        wxButton* _best_frame_rate;
        wxCheckBox* _three_d;
        wxChoice* _resolution;
@@ -103,6 +112,10 @@ private:
        wxCheckBox* _signed;
        wxCheckBox* _burn_subtitles;
        wxCheckBox* _encrypted;
+       wxStaticText* _key;
+       wxButton* _edit_key;
+
+       AudioDialog* _audio_dialog;
 
        boost::shared_ptr<Film> _film;
        bool _generally_sensitive;