Rename ScreenKDM -> KDMWithMetadata

[dcpomatic.git] / src / wx / kdm_output_panel.h

diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h
index 772c12a0d31ba9b124ae1cc08af8a6bcf6f786f0..730cb93601f785e7193e2e59245418c7230a74d7 100644 (file)
--- a/src/wx/kdm_output_panel.h
+++ b/src/wx/kdm_output_panel.h
@@ -18,13 +18,14 @@
 
 */
 
-#include "lib/screen_kdm.h"
+#include "lib/kdm_with_metadata.h"
 #include "wx_util.h"
 #include "name_format_editor.h"
 #include <dcp/types.h>
 #include <wx/wx.h>
 #include <boost/filesystem.hpp>
 
+class wxRadioButton;
 class wxDirPickerCtrl;
 class DirPickerCtrl;
 class KDMTimingPanel;
@@ -40,17 +41,29 @@ public:
 
        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::list<boost::shared_ptr<KDMWithMetadata> > screen_kdms,
                std::string name,
                KDMTimingPanel* timing,
-               boost::function<bool (boost::filesystem::path)> confirm_overwrite,
-               boost::shared_ptr<Log> log
+               boost::function<bool (boost::filesystem::path)> confirm_overwrite
                );
 
 private:
+       void kdm_write_type_changed ();
+       void advanced_clicked ();
+
        wxChoice* _type;
+       NameFormatEditor* _container_name_format;
        NameFormatEditor* _filename_format;
        wxCheckBox* _write_to;
 #ifdef DCPOMATIC_USE_OWN_PICKER
@@ -58,5 +71,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;
 };