X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.h;h=465104c74bfa85c254b4a4669a5cd6bbbeb0fab4;hb=d97029163865e212dc3d7b3c57c16459933a11f6;hp=69fc65532fdc4e3d046ece232d6dd9bb0bd2c62d;hpb=8755ef75cb001cf7fba230ffa98fb40eb2547849;p=dcpomatic.git

diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h
index 69fc65532..465104c74 100644
--- a/src/wx/dcp_panel.h
+++ b/src/wx/dcp_panel.h
@@ -36,7 +36,8 @@ class wxGridBagSizer;
 
 class AudioDialog;
 class MarkersDialog;
-class MetadataDialog;
+class InteropMetadataDialog;
+class SMPTEMetadataDialog;
 class Film;
 class FilmViewer;
 class Ratio;
@@ -73,12 +74,10 @@ private:
 	void three_d_changed ();
 	void standard_changed ();
 	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 ();
@@ -139,22 +138,19 @@ private:
 	wxStaticText* _standard_label;
 	wxChoice* _standard;
 	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;