X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_output_panel.h;h=7b931507170122d8ba7f78ffcfea864e26f2518c;hb=61efbb1cfe73c2a41896e60a8a335457e30674d1;hp=ee6a94e6857d68ba795557e297651eefb1201b63;hpb=f4964573a60155545e02cbbebc47199f7480cf14;p=dcpomatic.git

diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h
index ee6a94e68..7b9315071 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,64 @@
 
 */
 
+#include "lib/screen_kdm.h"
 #include "wx_util.h"
 #include "name_format_editor.h"
-#include "lib/kdm_filename_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);
 
+	void setup_sensitivity ();
+
 	boost::filesystem::path directory () const;
-	bool write_to () const;
 	dcp::Formulation formulation () const;
-	KDMFilenameFormat 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<boost::shared_ptr<Job>, int> make (
+		std::list<boost::shared_ptr<ScreenKDM> > screen_kdms,
+		std::string name,
+		KDMTimingPanel* timing,
+		boost::function<bool (boost::filesystem::path)> confirm_overwrite
+		);
 
 private:
+	void kdm_write_type_changed ();
+	void advanced_clicked ();
+
 	wxChoice* _type;
-	NameFormatEditor<KDMFilenameFormat>* _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;
 };