X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.h;h=a81af4f454d77fa366540d5eaebbfae5d084d90e;hb=3f5b9a71f980525481251461f9c3d63806972470;hp=655472264f25663687f29c9eb87afb08b0f34efe;hpb=b6e388dc3ea1ab37711f50bbc28a93f48de98db3;p=dcpomatic.git

diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h
index 655472264..a81af4f45 100644
--- 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 ();
@@ -66,12 +67,17 @@ private:
 	void three_d_changed ();
 	void standard_changed ();
 	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,22 +93,27 @@ 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;
 	wxChoice* _audio_channels;
+	wxChoice* _audio_processor;
+	wxButton* _show_audio;
 	wxButton* _best_frame_rate;
 	wxCheckBox* _three_d;
 	wxChoice* _resolution;
 	wxChoice* _standard;
 	wxCheckBox* _signed;
-	wxCheckBox* _burn_subtitles;
 	wxCheckBox* _encrypted;
+	wxStaticText* _key;
+	wxButton* _edit_key;
+
+	AudioDialog* _audio_dialog;
 
 	boost::shared_ptr<Film> _film;
 	bool _generally_sensitive;