X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.h;h=cd39f2d1ef11b5de46cbbea78b9524a50fb76e64;hb=fe851f2e6e57d3a8781ecc173089c19632c521e3;hp=cce97a2dc314ee9b743fb3386a9721c43d45ede0;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h
index cce97a2dc..cd39f2d1e 100644
--- a/src/wx/dcp_panel.h
+++ b/src/wx/dcp_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2022 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,15 +18,19 @@
 
 */
 
+
+#include "wx_ptr.h"
 #include "lib/config.h"
-#include <boost/noncopyable.hpp>
+#include "lib/film.h"
+
 
+class Button;
+class CheckBox;
 class wxNotebook;
 class wxPanel;
 class wxBoxSizer;
 class wxTextCtrl;
 class wxStaticText;
-class wxCheckBox;
 class wxChoice;
 class wxButton;
 class wxSpinCtrl;
@@ -34,22 +38,26 @@ class wxSizer;
 class wxGridBagSizer;
 
 class AudioDialog;
-class MarkersDialog;
-class InteropMetadataDialog;
-class SMPTEMetadataDialog;
+class Choice;
 class Film;
 class FilmViewer;
+class InteropMetadataDialog;
+class MarkersDialog;
 class Ratio;
+class SMPTEMetadataDialog;
 
-class DCPPanel : public boost::noncopyable
+class DCPPanel
 {
 public:
-	DCPPanel (wxNotebook *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer);
+	DCPPanel(wxNotebook *, std::shared_ptr<Film>, FilmViewer& viewer);
+
+	DCPPanel (DCPPanel const&) = delete;
+	DCPPanel& operator= (DCPPanel const&) = delete;
 
 	void set_film (std::shared_ptr<Film>);
 	void set_general_sensitivity (bool);
 
-	void film_changed (int);
+	void film_changed (Film::Property);
 	void film_content_changed (int);
 
 	wxPanel* panel () const {
@@ -59,7 +67,6 @@ public:
 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 ();
@@ -80,6 +87,9 @@ private:
 	void markers_clicked ();
 	void metadata_clicked ();
 	void reencode_j2k_changed ();
+	void enable_audio_language_toggled ();
+	void edit_audio_language_clicked ();
+	void audio_sample_rate_changed ();
 
 	void setup_frame_rate_widget ();
 	void setup_container ();
@@ -109,36 +119,40 @@ private:
 	wxStaticText* _name_label;
 	wxTextCtrl* _name;
 	wxStaticText* _dcp_name;
-	wxCheckBox* _use_isdcf_name;
+	CheckBox* _use_isdcf_name;
+	CheckBox* _enable_audio_language = nullptr;
+	wxStaticText* _audio_language = nullptr;
+	Button* _edit_audio_language = nullptr;
 	wxStaticText* _container_label;
-	wxChoice* _container;
+	Choice* _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;
+	Choice* _dcp_content_type;
 	wxStaticText* _frame_rate_label;
-	wxChoice* _frame_rate_choice;
+	Choice* _frame_rate_choice;
 	wxSpinCtrl* _frame_rate_spin;
 	wxSizer* _frame_rate_sizer;
 	wxStaticText* _channels_label;
-	wxChoice* _audio_channels;
+	Choice* _audio_channels;
+	wxStaticText* _audio_sample_rate_label = nullptr;
+	wxChoice* _audio_sample_rate = nullptr;
 	wxStaticText* _processor_label;
-	wxChoice* _audio_processor;
+	Choice* _audio_processor;
 	wxButton* _show_audio;
 	wxButton* _best_frame_rate;
-	wxCheckBox* _three_d;
-	wxCheckBox* _reencode_j2k;
+	CheckBox* _three_d;
+	CheckBox* _reencode_j2k;
 	wxStaticText* _resolution_label;
-	wxChoice* _resolution;
+	Choice* _resolution;
 	wxStaticText* _standard_label;
-	wxChoice* _standard;
-	wxCheckBox* _encrypted;
+	Choice* _standard;
+	CheckBox* _encrypted;
 	wxStaticText* _reels_label;
-	wxChoice* _reel_type;
+	Choice* _reel_type;
 	wxStaticText* _reel_length_label;
 	wxStaticText* _reel_length_gb_label;
 	wxSpinCtrl* _reel_length;
@@ -146,12 +160,12 @@ private:
 	wxButton* _metadata;
 	wxSizer* _audio_panel_sizer;
 
-	AudioDialog* _audio_dialog;
-	MarkersDialog* _markers_dialog;
-	InteropMetadataDialog* _interop_metadata_dialog;
-	SMPTEMetadataDialog* _smpte_metadata_dialog;
+	wx_ptr<AudioDialog> _audio_dialog;
+	wx_ptr<MarkersDialog> _markers_dialog;
+	wx_ptr<InteropMetadataDialog> _interop_metadata_dialog;
+	wx_ptr<SMPTEMetadataDialog> _smpte_metadata_dialog;
 
 	std::shared_ptr<Film> _film;
-	std::weak_ptr<FilmViewer> _viewer;
+	FilmViewer& _viewer;
 	bool _generally_sensitive;
 };