X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_output_panel.h;h=e8515d2c6c3e6ef90e831de73ff2746e357db05b;hb=d6f2c9547db4dbde17ae97ea37148b62a249bf63;hp=002b189f591db6bcf63318dbcd7059d6be47f254;hpb=736b3a068ba5a402b541d32f270669e6e1a4e5c4;p=dcpomatic.git

diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h
index 002b189f5..e8515d2c6 100644
--- a/src/wx/kdm_output_panel.h
+++ b/src/wx/kdm_output_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,37 +18,63 @@
 
 */
 
+#include "lib/kdm_with_metadata.h"
 #include "wx_util.h"
 #include "name_format_editor.h"
-#include "lib/kdm_name_format.h"
 #include <dcp/types.h>
 #include <wx/wx.h>
 #include <boost/filesystem.hpp>
 
+class wxRadioButton;
 class wxDirPickerCtrl;
 class DirPickerCtrl;
+class KDMTimingPanel;
+class Job;
+class Log;
 
 class KDMOutputPanel : public wxPanel
 {
 public:
-	KDMOutputPanel (wxWindow* parent, bool interop);
+	KDMOutputPanel (wxWindow* parent);
+
+	void setup_sensitivity ();
 
 	boost::filesystem::path directory () const;
-	bool write_to () const;
 	dcp::Formulation formulation () const;
-	KDMNameFormat name_format () 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;
+	}
 
-	void setup_sensitivity ();
-	void save_kdm_name_format () const;
+	std::pair<std::shared_ptr<Job>, int> make (
+		std::list<KDMWithMetadataPtr > screen_kdms,
+		std::string name,
+		std::function<bool (boost::filesystem::path)> confirm_overwrite
+		);
 
 private:
+	void kdm_write_type_changed ();
+	void advanced_clicked ();
+
 	wxChoice* _type;
-	NameFormatEditor<KDMNameFormat>* _filename_format;
-	wxRadioButton* _write_to;
+	NameFormatEditor* _container_name_format;
+	NameFormatEditor* _filename_format;
+	wxCheckBox* _write_to;
 #ifdef DCPOMATIC_USE_OWN_PICKER
 	DirPickerCtrl* _folder;
 #else
 	wxDirPickerCtrl* _folder;
 #endif
-	wxRadioButton* _email;
+	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;
 };