X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.h;h=9209d3f9ba5197e64df993cb8b0885f9b87c7691;hb=3a56fa86d04c631143a45bdb34cb0e570e4ca9fb;hp=060ec31ff972c55cd99830821c313de315fbdef7;hpb=bfe277e664a03ec47cd6bee7e1b1e4aca6eb38e6;p=dcpomatic.git

diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h
index 060ec31ff..9209d3f9b 100644
--- a/src/wx/dcp_panel.h
+++ b/src/wx/dcp_panel.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -31,6 +32,8 @@ class wxButton;
 class wxSpinCtrl;
 class wxSizer;
 
+class AudioDialog;
+
 class Film;
 
 class DCPPanel : public boost::noncopyable
@@ -55,7 +58,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,13 +68,20 @@ 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 reel_type_changed ();
+	void reel_length_changed ();
+	void upload_after_make_dcp_changed ();
 
 	void setup_frame_rate_widget ();
 	void setup_container ();
 	void setup_dcp_name ();
 
+	int minimum_allowed_audio_channels () const;
+
 	wxPanel* make_general_panel ();
 	wxPanel* make_video_panel ();
 	wxPanel* make_audio_panel ();
@@ -87,22 +96,30 @@ 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;
 	wxChoice* _standard;
 	wxCheckBox* _signed;
-	wxCheckBox* _burn_subtitles;
 	wxCheckBox* _encrypted;
+	wxStaticText* _key;
+	wxButton* _edit_key;
+	wxChoice* _reel_type;
+	wxSpinCtrl* _reel_length;
+	wxCheckBox* _upload_after_make_dcp;
+
+	AudioDialog* _audio_dialog;
 
 	boost::shared_ptr<Film> _film;
 	bool _generally_sensitive;