X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.h;h=ac6792dddf7649adff8ed7756c5fe4d4e98229ca;hb=20eea989f452ea1a6af0af6b5c5b504d3b19480c;hp=88a9c4c51a1b1b869320a62e8a68778abc51132d;hpb=12efbd5938f08eb445b43f539fa4f27aa5caccfb;p=dcpomatic.git

diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h
index 88a9c4c51..ac6792ddd 100644
--- a/src/wx/dcp_panel.h
+++ b/src/wx/dcp_panel.h
@@ -18,6 +18,7 @@
 */
 
 #include <boost/shared_ptr.hpp>
+#include <boost/noncopyable.hpp>
 
 class wxNotebook;
 class wxPanel;
@@ -30,9 +31,11 @@ class wxButton;
 class wxSpinCtrl;
 class wxSizer;
 
+class AudioDialog;
+
 class Film;
 
-class DCPPanel
+class DCPPanel : public boost::noncopyable
 {
 public:
 	DCPPanel (wxNotebook *, boost::shared_ptr<Film>);
@@ -51,9 +54,9 @@ private:
 	void name_changed ();
 	void use_isdcf_name_toggled ();
 	void edit_isdcf_button_clicked ();
+	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,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 ();
@@ -85,14 +94,17 @@ private:
 	wxStaticText* _dcp_name;
 	wxCheckBox* _use_isdcf_name;
 	wxChoice* _container;
+	wxStaticText* _container_size;
 	wxButton* _edit_isdcf_button;
-	wxChoice* _scaler;
+	wxButton* _copy_isdcf_name_button;
  	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;
@@ -100,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;