X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.h;h=9b362a26cd540118a433e2860dc9f64ef3649458;hb=449be30bcb75e136d0985f68f3d942d2059e1802;hp=f717e83273c2219285ecfbc8b10441004ceb3bb6;hpb=14b8b29e6660f5a7fb21135fb5f90b4c1ce51a4b;p=dcpomatic.git

diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h
index f717e8327..9b362a26c 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-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,9 +18,10 @@
 
 */
 
+
 #include "lib/config.h"
-#include <boost/shared_ptr.hpp>
-#include <boost/noncopyable.hpp>
+#include "lib/film.h"
+
 
 class wxNotebook;
 class wxPanel;
@@ -36,20 +37,24 @@ class wxGridBagSizer;
 
 class AudioDialog;
 class MarkersDialog;
-class MetadataDialog;
+class InteropMetadataDialog;
+class SMPTEMetadataDialog;
 class Film;
 class FilmViewer;
 class Ratio;
 
-class DCPPanel : public boost::noncopyable
+class DCPPanel
 {
 public:
-	DCPPanel (wxNotebook *, boost::shared_ptr<Film>, boost::weak_ptr<FilmViewer> viewer);
+	DCPPanel (wxNotebook *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer);
+
+	DCPPanel (DCPPanel const&) = delete;
+	DCPPanel& operator= (DCPPanel const&) = delete;
 
-	void set_film (boost::shared_ptr<Film>);
+	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 {
@@ -72,14 +77,11 @@ private:
 	void resolution_changed ();
 	void three_d_changed ();
 	void standard_changed ();
-	void signed_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 ();
@@ -90,6 +92,7 @@ private:
 	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;
 
@@ -138,25 +141,22 @@ private:
 	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;
+	wxSizer* _audio_panel_sizer;
 
 	AudioDialog* _audio_dialog;
 	MarkersDialog* _markers_dialog;
-	MetadataDialog* _metadata_dialog;
+	InteropMetadataDialog* _interop_metadata_dialog;
+	SMPTEMetadataDialog* _smpte_metadata_dialog;
 
-	boost::shared_ptr<Film> _film;
-	boost::weak_ptr<FilmViewer> _viewer;
+	std::shared_ptr<Film> _film;
+	std::weak_ptr<FilmViewer> _viewer;
 	bool _generally_sensitive;
 };