X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.h;h=f717e83273c2219285ecfbc8b10441004ceb3bb6;hb=3044ef060894c62e8a1cef15ad14078001093982;hp=b8a67b2f5613c8acae69632749ecb1260060c394;hpb=4b3554db5556f8745ff36c5ca80423aaa41ae506;p=dcpomatic.git

diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h
index b8a67b2f5..f717e8327 100644
--- a/src/wx/dcp_panel.h
+++ b/src/wx/dcp_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+#include "lib/config.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
 
@@ -31,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);
@@ -75,10 +80,16 @@ private:
 	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 add_to_grid ();
+	void add_video_panel_to_grid ();
+	void add_audio_panel_to_grid ();
 
 	int minimum_allowed_audio_channels () const;
 
@@ -86,43 +97,66 @@ 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* _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;
 
 	AudioDialog* _audio_dialog;
+	MarkersDialog* _markers_dialog;
+	MetadataDialog* _metadata_dialog;
 
 	boost::shared_ptr<Film> _film;
+	boost::weak_ptr<FilmViewer> _viewer;
 	bool _generally_sensitive;
 };