X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_dialog.cc;h=be7e2506542be7ad4f73095c9683e611cceb06bf;hb=6654f028571db33d1e203ff36f85619d03a9f9fb;hp=40efc5411e61bfac248e8a181ecb386552d2e1a4;hpb=65a73ce59aeb4b452f55a87c001acb3cf177e99f;p=dcpomatic.git

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 40efc5411..be7e25065 100644
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -48,6 +48,7 @@ using std::cout;
 using std::vector;
 using std::make_pair;
 using boost::shared_ptr;
+using boost::bind;
 
 KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film)
 	: wxDialog (parent, wxID_ANY, _("Make KDMs"))
@@ -106,7 +107,7 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film)
 
 	_screens->ScreensChanged.connect (boost::bind (&KDMDialog::setup_sensitivity, this));
 	_timing->TimingChanged.connect (boost::bind (&KDMDialog::setup_sensitivity, this));
-	_make->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMDialog::make_clicked, this));
+	_make->Bind (wxEVT_BUTTON, boost::bind (&KDMDialog::make_clicked, this));
 
 	setup_sensitivity ();
 
@@ -123,70 +124,37 @@ KDMDialog::setup_sensitivity ()
 	_make->Enable (!_screens->screens().empty() && _timing->valid() && _cpl->has_selected());
 }
 
+bool
+KDMDialog::confirm_overwrite (boost::filesystem::path path)
+{
+	return confirm_dialog (
+		this,
+		wxString::Format (_("File %s already exists.  Do you want to overwrite it?"), std_to_wx(path.string()).data())
+		);
+}
+
 void
 KDMDialog::make_clicked ()
 {
 	shared_ptr<const Film> film = _film.lock ();
 	DCPOMATIC_ASSERT (film);
 
-	_output->save_kdm_name_format ();
+	list<ScreenKDM> screen_kdms = film->make_kdms (
+		_screens->screens(), _cpl->cpl(), _timing->from(), _timing->until(), _output->formulation(),
+		!_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional<int>() : 0
+		);
 
-	try {
-		list<ScreenKDM> screen_kdms = film->make_kdms (
-			_screens->screens(), _cpl->cpl(), _timing->from(), _timing->until(), _output->formulation()
-			);
+	pair<shared_ptr<Job>, int> result = _output->make (screen_kdms, film->name(), _timing, bind (&KDMDialog::confirm_overwrite, this, _1), film->log());
+	if (result.first) {
+		JobManager::instance()->add (result.first);
+	}
 
-		dcp::NameFormat::Map name_values;
-		name_values['f'] = film->name();
-		name_values['b'] = dcp::LocalTime(_timing->from()).date() + " " + dcp::LocalTime(_timing->from()).time_of_day();
-		name_values['e'] = dcp::LocalTime(_timing->until()).date() + " " + dcp::LocalTime(_timing->until()).time_of_day();
-
-		if (_output->write_to ()) {
-			ScreenKDM::write_files (
-				screen_kdms,
-				_output->directory(),
-				_output->name_format(),
-				name_values
-				);
-		}
-
-		if (_output->email ()) {
-
-			list<CinemaKDMs> const cinema_kdms = CinemaKDMs::collect (screen_kdms);
-
-			bool ok = true;
-
-			if (Config::instance()->confirm_kdm_email ()) {
-				list<string> emails;
-				BOOST_FOREACH (CinemaKDMs i, cinema_kdms) {
-					BOOST_FOREACH (string j, i.cinema->emails) {
-						emails.push_back (j);
-					}
-				}
-
-				ConfirmKDMEmailDialog* d = new ConfirmKDMEmailDialog (this, emails);
-				if (d->ShowModal() == wxID_CANCEL) {
-					ok = false;
-				}
-			}
-
-			if (ok) {
-				JobManager::instance()->add (
-					shared_ptr<Job> (new SendKDMEmailJob (
-								 cinema_kdms,
-								 _output->name_format(),
-								 name_values,
-								 film->dcp_name(),
-								 film->log()
-								 ))
-					);
-			}
-		}
-	} catch (dcp::NotEncryptedError& e) {
-		error_dialog (this, _("CPL's content is not encrypted."));
-	} catch (exception& e) {
-		error_dialog (this, e.what ());
-	} catch (...) {
-		error_dialog (this, _("An unknown exception occurred."));
+	if (result.second > 0) {
+		/* XXX: proper plural form support in wxWidgets? */
+		wxString s = result.second == 1 ? _("%d KDM written to %s") : _("%d KDMs written to %s");
+		message_dialog (
+			this,
+			wxString::Format (s, result.second, std_to_wx(_output->directory().string()).data())
+			);
 	}
 }