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

diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h
index ac6792ddd..887ae7c77 100644
--- a/src/wx/dcp_panel.h
+++ b/src/wx/dcp_panel.h
@@ -1,22 +1,24 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 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/>.
 
 */
 
+#include "lib/config.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
 
@@ -30,15 +32,19 @@ class wxChoice;
 class wxButton;
 class wxSpinCtrl;
 class wxSizer;
+class wxGridBagSizer;
 
 class AudioDialog;
-
+class MarkersDialog;
+class MetadataDialog;
 class Film;
+class FilmViewer;
+class Ratio;
 
 class DCPPanel : public boost::noncopyable
 {
 public:
-	DCPPanel (wxNotebook *, boost::shared_ptr<Film>);
+	DCPPanel (wxNotebook *, boost::shared_ptr<Film>, boost::weak_ptr<FilmViewer> viewer);
 
 	void set_film (boost::shared_ptr<Film>);
 	void set_general_sensitivity (bool);
@@ -67,16 +73,24 @@ 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 markers_clicked ();
+	void metadata_clicked ();
+	void reencode_j2k_changed ();
+
 	void setup_frame_rate_widget ();
 	void setup_container ();
 	void setup_dcp_name ();
-	void setup_audio_channels_choice ();
+	void add_to_grid ();
+	void add_video_panel_to_grid ();
+	void add_audio_panel_to_grid ();
+	void add_audio_processors ();
 
 	int minimum_allowed_audio_channels () const;
 
@@ -84,39 +98,67 @@ private:
 	wxPanel* make_video_panel ();
 	wxPanel* make_audio_panel ();
 
-	void config_changed ();
+	void config_changed (Config::Property p);
+
+	void setup_sensitivity ();
 
 	wxPanel* _panel;
 	wxNotebook* _notebook;
 	wxBoxSizer* _sizer;
+	wxGridBagSizer* _grid;
+	wxGridBagSizer* _video_grid;
+	wxGridBagSizer* _audio_grid;
 
+	wxStaticText* _name_label;
 	wxTextCtrl* _name;
 	wxStaticText* _dcp_name;
 	wxCheckBox* _use_isdcf_name;
+	wxStaticText* _container_label;
 	wxChoice* _container;
 	wxStaticText* _container_size;
 	wxButton* _edit_isdcf_button;
 	wxButton* _copy_isdcf_name_button;
+	wxStaticText* _j2k_bandwidth_label;
+	wxStaticText* _mbits_label;
  	wxSpinCtrl* _j2k_bandwidth;
+	wxStaticText* _dcp_content_type_label;
 	wxChoice* _dcp_content_type;
+	wxStaticText* _frame_rate_label;
 	wxChoice* _frame_rate_choice;
 	wxSpinCtrl* _frame_rate_spin;
 	wxSizer* _frame_rate_sizer;
+	wxStaticText* _channels_label;
 	wxChoice* _audio_channels;
+	wxStaticText* _processor_label;
 	wxChoice* _audio_processor;
 	wxButton* _show_audio;
 	wxButton* _best_frame_rate;
 	wxCheckBox* _three_d;
+	wxCheckBox* _reencode_j2k;
+	wxStaticText* _resolution_label;
 	wxChoice* _resolution;
+	wxStaticText* _standard_label;
 	wxChoice* _standard;
 	wxCheckBox* _signed;
-	wxCheckBox* _burn_subtitles;
 	wxCheckBox* _encrypted;
+	wxStaticText* _key_label;
 	wxStaticText* _key;
 	wxButton* _edit_key;
+	wxStaticText* _reels_label;
+	wxChoice* _reel_type;
+	wxStaticText* _reel_length_label;
+	wxStaticText* _reel_length_gb_label;
+	wxSpinCtrl* _reel_length;
+	wxCheckBox* _upload_after_make_dcp;
+	wxButton* _markers;
+	wxButton* _metadata;
+	wxSizer* _audio_panel_sizer;
 
 	AudioDialog* _audio_dialog;
+	MarkersDialog* _markers_dialog;
+	MetadataDialog* _metadata_dialog;
 
 	boost::shared_ptr<Film> _film;
+	boost::weak_ptr<FilmViewer> _viewer;
 	bool _generally_sensitive;
 };