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 07bbce2d2510995ce7da460c6bc14910dcf9fcbc..d76a2735902d97923466f8ce1bac34b7ad391b1e 100644 (file)
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -28,6 +28,8 @@
 #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
@@ -47,8 +49,9 @@ using boost::function;
 
 KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
        : wxPanel (parent, wxID_ANY)
-       , _forensic_mark_video (false)
-       , _forensic_mark_audio (false)
+       , _forensic_mark_video (true)
+       , _forensic_mark_audio (true)
+       , _forensic_mark_audio_up_to (12)
 {
        wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0);
 
@@ -65,7 +68,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
        }
        type->Add (_type, 1, wxEXPAND);
        _type->SetSelection (0);
-       wxButton* advanced = new wxButton (this, wxID_ANY, _("Advanced..."));
+       wxButton* advanced = new Button (this, _("Advanced..."));
        type->Add (advanced, 0, wxALIGN_CENTER_VERTICAL);
        table->Add (type, 1, wxEXPAND);
 
@@ -75,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";
@@ -89,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
@@ -117,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);
 
@@ -158,10 +161,11 @@ KDMOutputPanel::setup_sensitivity ()
 void
 KDMOutputPanel::advanced_clicked ()
 {
-       KDMAdvancedDialog* d = new KDMAdvancedDialog (this, _forensic_mark_video, _forensic_mark_audio);
+       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 ();
 }
 
@@ -179,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);
@@ -278,8 +282,7 @@ KDMOutputPanel::make (
                                        _container_name_format->get(),
                                        _filename_format->get(),
                                        name_values,
-                                       name,
-                                       log
+                                       name
                                        )
                                );
                }