X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_output_panel.cc;h=d76a2735902d97923466f8ce1bac34b7ad391b1e;hb=3e3e8433842820ce6380e8f5c1917ae1a28e2e57;hp=bcaad33e4c3f4376c6f807d8d6c09bbe3a779f58;hpb=8b2a3f31b6b4238d8534549f495e7276174ddfba;p=dcpomatic.git

diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index bcaad33e4..d76a27359 100644
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -49,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);
 
@@ -77,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";
@@ -160,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 ();
 }
 
@@ -181,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
+	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);