Allow specification of audio forensic marking (in KDMs) for some channels only. ...

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

diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index 6d741cf5ec41345ddf1275a55d8ca4a49b7b5ad2..d76a2735902d97923466f8ce1bac34b7ad391b1e 100644 (file)
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -26,7 +26,10 @@
 #include "kdm_timing_panel.h"
 #include "confirm_kdm_email_dialog.h"
 #include "wx_util.h"
+#include "kdm_advanced_dialog.h"
 #include "name_format_editor.h"
+#include "check_box.h"
+#include "dcpomatic_button.h"
 #include <dcp/exceptions.h>
 #include <dcp/types.h>
 #ifdef DCPOMATIC_USE_OWN_PICKER
@@ -46,10 +49,15 @@ using boost::function;
 
 KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
        : wxPanel (parent, wxID_ANY)
+       , _forensic_mark_video (true)
+       , _forensic_mark_audio (true)
+       , _forensic_mark_audio_up_to (12)
 {
        wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0);
 
        add_label_to_sizer (table, this, _("KDM type"), true);
+
+       wxBoxSizer* type = new wxBoxSizer (wxHORIZONTAL);
        _type = new wxChoice (this, wxID_ANY);
        _type->Append ("Modified Transitional 1", ((void *) dcp::MODIFIED_TRANSITIONAL_1));
        _type->Append ("Multiple Modified Transitional 1", ((void *) dcp::MULTIPLE_MODIFIED_TRANSITIONAL_1));
@@ -58,8 +66,11 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
                _type->Append ("DCI Any", ((void *) dcp::DCI_ANY));
                _type->Append ("DCI Specific", ((void *) dcp::DCI_SPECIFIC));
        }
-       table->Add (_type, 1, wxEXPAND);
+       type->Add (_type, 1, wxEXPAND);
        _type->SetSelection (0);
+       wxButton* advanced = new Button (this, _("Advanced..."));
+       type->Add (advanced, 0, wxALIGN_CENTER_VERTICAL);
+       table->Add (type, 1, wxEXPAND);
 
        add_label_to_sizer (table, this, _("Folder / ZIP name format"), true, 0, wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT);
        _container_name_format = new NameFormatEditor (this, Config::instance()->kdm_container_name_format(), dcp::NameFormat::Map(), dcp::NameFormat::Map(), "");
@@ -67,11 +78,11 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
 
        add_label_to_sizer (table, this, _("Filename format"), true, 0, wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT);
        dcp::NameFormat::Map titles;
-       titles['f'] = "film name";
-       titles['c'] = "cinema";
-       titles['s'] = "screen";
-       titles['b'] = "from date/time";
-       titles['e'] = "to date/time";
+       titles['f'] = wx_to_std (_("film name"));
+       titles['c'] = wx_to_std (_("cinema"));
+       titles['s'] = wx_to_std (_("screen"));
+       titles['b'] = wx_to_std (_("from date/time"));
+       titles['e'] = wx_to_std (_("to date/time"));
        dcp::NameFormat::Map ex;
        ex['f'] = "Bambi";
        ex['c'] = "Lumière";
@@ -81,7 +92,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
        _filename_format = new NameFormatEditor (this, Config::instance()->kdm_filename_format(), titles, ex, ".xml");
        table->Add (_filename_format->panel(), 1, wxEXPAND);
 
-       _write_to = new wxCheckBox (this, wxID_ANY, _("Write to"));
+       _write_to = new CheckBox (this, _("Write to"));
        table->Add (_write_to, 1, wxEXPAND);
 
 #ifdef DCPOMATIC_USE_OWN_PICKER
@@ -109,7 +120,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
        table->AddSpacer (0);
        table->Add (write_options);
 
-       _email = new wxCheckBox (this, wxID_ANY, _("Send by email"));
+       _email = new CheckBox (this, _("Send by email"));
        table->Add (_email, 1, wxEXPAND);
        table->AddSpacer (0);
 
@@ -132,6 +143,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
        _write_flat->Bind   (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this));
        _write_folder->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this));
        _write_zip->Bind    (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this));
+       advanced->Bind      (wxEVT_BUTTON, boost::bind (&KDMOutputPanel::advanced_clicked, this));
 
        SetSizer (table);
 }
@@ -146,6 +158,17 @@ KDMOutputPanel::setup_sensitivity ()
        _write_zip->Enable (write);
 }
 
+void
+KDMOutputPanel::advanced_clicked ()
+{
+       KDMAdvancedDialog* d = new KDMAdvancedDialog (this, _forensic_mark_video, _forensic_mark_audio, _forensic_mark_audio_up_to);
+       d->ShowModal ();
+       _forensic_mark_video = d->forensic_mark_video ();
+       _forensic_mark_audio = d->forensic_mark_audio ();
+       _forensic_mark_audio_up_to = d->forensic_mark_audio_up_to ();
+       d->Destroy ();
+}
+
 void
 KDMOutputPanel::kdm_write_type_changed ()
 {
@@ -160,7 +183,7 @@ KDMOutputPanel::kdm_write_type_changed ()
 
 pair<shared_ptr<Job>, int>
 KDMOutputPanel::make (
-       list<ScreenKDM> screen_kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite, shared_ptr<Log> log
+       list<shared_ptr<ScreenKDM> > screen_kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite
        )
 {
        list<CinemaKDMs> const cinema_kdms = CinemaKDMs::collect (screen_kdms);
@@ -259,8 +282,7 @@ KDMOutputPanel::make (
                                        _container_name_format->get(),
                                        _filename_format->get(),
                                        name_values,
-                                       name,
-                                       log
+                                       name
                                        )
                                );
                }