X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_output_panel.h;h=040815392d0036cd2a69b84a1643e65b2a00d827;hb=8cb1cf6a5577fcb75d210006abe334be755973a0;hp=ba947b7149067970bb80f412ded37c37835c0ea5;hpb=6654f028571db33d1e203ff36f85619d03a9f9fb;p=dcpomatic.git

diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h
index ba947b714..040815392 100644
--- a/src/wx/kdm_output_panel.h
+++ b/src/wx/kdm_output_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2022 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,24 +18,30 @@
 
 */
 
-#include "lib/screen_kdm.h"
+
 #include "wx_util.h"
-#include "name_format_editor.h"
+#include "lib/kdm_with_metadata.h"
 #include <dcp/types.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
-class wxRadioButton;
-class wxDirPickerCtrl;
+
+class CheckBox;
 class DirPickerCtrl;
-class KDMTimingPanel;
 class Job;
-class Log;
+class KDMChoice;
+class NameFormatEditor;
+class wxDirPickerCtrl;
+class wxRadioButton;
+
 
 class KDMOutputPanel : public wxPanel
 {
 public:
-	KDMOutputPanel (wxWindow* parent, bool interop);
+	KDMOutputPanel (wxWindow* parent);
 
 	void setup_sensitivity ();
 
@@ -47,23 +53,27 @@ public:
 	bool forensic_mark_audio () const {
 		return _forensic_mark_audio;
 	}
+	boost::optional<int> forensic_mark_audio_up_to () const {
+		return _forensic_mark_audio_up_to;
+	}
 
-	std::pair<boost::shared_ptr<Job>, int> make (
-		std::list<ScreenKDM> screen_kdms,
+	std::pair<std::shared_ptr<Job>, int> make (
+		std::list<KDMWithMetadataPtr> screen_kdms,
 		std::string name,
-		KDMTimingPanel* timing,
-		boost::function<bool (boost::filesystem::path)> confirm_overwrite,
-		boost::shared_ptr<Log> log
+		std::function<bool (boost::filesystem::path)> confirm_overwrite
 		);
 
 private:
 	void kdm_write_type_changed ();
 	void advanced_clicked ();
+	void write_to_changed ();
+	void email_changed ();
+	void add_email_addresses_clicked ();
 
-	wxChoice* _type;
+	KDMChoice* _type;
 	NameFormatEditor* _container_name_format;
 	NameFormatEditor* _filename_format;
-	wxCheckBox* _write_to;
+	CheckBox* _write_to;
 #ifdef DCPOMATIC_USE_OWN_PICKER
 	DirPickerCtrl* _folder;
 #else
@@ -72,7 +82,9 @@ private:
 	wxRadioButton* _write_flat;
 	wxRadioButton* _write_folder;
 	wxRadioButton* _write_zip;
-	wxCheckBox* _email;
+	CheckBox* _email;
 	bool _forensic_mark_video;
 	bool _forensic_mark_audio;
+	boost::optional<int> _forensic_mark_audio_up_to;
+	std::vector<std::string> _extra_addresses;
 };