X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fkdm_output_panel.h;h=872d23a8f9f6afe38d4b15e33d43ee42386dab65;hb=08b44e380c8be3a8cb2dacbd94049f09942dabc1;hp=772c12a0d31ba9b124ae1cc08af8a6bcf6f786f0;hpb=ccc8409dceedcf71872b2846b9b4a4dea9042bda;p=dcpomatic.git

diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h
index 772c12a0d..872d23a8f 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,39 +18,58 @@
 
 */
 
-#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 wxDirPickerCtrl;
+
 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 ();
 
 	boost::filesystem::path directory () const;
 	dcp::Formulation formulation () const;
+	bool forensic_mark_video () const {
+		return _forensic_mark_video;
+	}
+	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:
-	wxChoice* _type;
+	void kdm_write_type_changed ();
+	void advanced_clicked ();
+	void write_to_changed ();
+	void email_changed ();
+
+	KDMChoice* _type;
+	NameFormatEditor* _container_name_format;
 	NameFormatEditor* _filename_format;
 	wxCheckBox* _write_to;
 #ifdef DCPOMATIC_USE_OWN_PICKER
@@ -58,5 +77,11 @@ private:
 #else
 	wxDirPickerCtrl* _folder;
 #endif
+	wxRadioButton* _write_flat;
+	wxRadioButton* _write_folder;
+	wxRadioButton* _write_zip;
 	wxCheckBox* _email;
+	bool _forensic_mark_video;
+	bool _forensic_mark_audio;
+	boost::optional<int> _forensic_mark_audio_up_to;
 };