/*
- 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.
*/
-#include "lib/config.h"
-#include "lib/cinema.h"
-#include "lib/cinema_kdms.h"
-#include "lib/send_kdm_email_job.h"
#include "kdm_output_panel.h"
#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 "lib/config.h"
+#include "lib/cinema.h"
+#include "lib/send_kdm_email_job.h"
+#include "lib/warnings.h"
#include <dcp/exceptions.h>
#include <dcp/types.h>
#ifdef DCPOMATIC_USE_OWN_PICKER
#include "dir_picker_ctrl.h"
#else
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/filepicker.h>
+DCPOMATIC_ENABLE_WARNINGS
#endif
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/stdpaths.h>
+DCPOMATIC_ENABLE_WARNINGS
using std::pair;
using std::string;
using std::list;
using std::exception;
using std::make_pair;
-using boost::shared_ptr;
-using boost::function;
+using std::shared_ptr;
+using std::function;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
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);
+ table->AddGrowableCol (1);
- add_label_to_sizer (table, this, _("KDM type"), true);
+ add_label_to_sizer (table, this, _("KDM type"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
+
+ 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));
- _type->Append ("Modified Transitional 1 (without AuthorizedDeviceInfo)", ((void *) dcp::MODIFIED_TRANSITIONAL_TEST));
+ _type->Append ("Modified Transitional 1", ((void *) dcp::Formulation::MODIFIED_TRANSITIONAL_1));
+ _type->Append ("Multiple Modified Transitional 1", ((void *) dcp::Formulation::MULTIPLE_MODIFIED_TRANSITIONAL_1));
+ _type->Append ("Modified Transitional 1 (without AuthorizedDeviceInfo)", ((void *) dcp::Formulation::MODIFIED_TRANSITIONAL_TEST));
if (!interop) {
- _type->Append ("DCI Any", ((void *) dcp::DCI_ANY));
- _type->Append ("DCI Specific", ((void *) dcp::DCI_SPECIFIC));
+ _type->Append ("DCI Any", ((void *) dcp::Formulation::DCI_ANY));
+ _type->Append ("DCI Specific", ((void *) dcp::Formulation::DCI_SPECIFIC));
}
- table->Add (_type, 1, wxEXPAND);
+ type->Add (_type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD);
_type->SetSelection (0);
+ wxButton* advanced = new Button (this, _("Advanced..."));
+ type->Add (advanced, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
+ table->Add (type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD);
- add_label_to_sizer (table, this, _("Folder / ZIP name format"), true, 0, wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT);
+ add_label_to_sizer (table, this, _("Folder / ZIP name format"), true, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT);
_container_name_format = new NameFormatEditor (this, Config::instance()->kdm_container_name_format(), dcp::NameFormat::Map(), dcp::NameFormat::Map(), "");
table->Add (_container_name_format->panel(), 1, wxEXPAND);
- add_label_to_sizer (table, this, _("Filename format"), true, 0, wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT);
+ auto format = create_label (this, _("Filename format"), true);
+ auto align = new wxBoxSizer (wxHORIZONTAL);
+#ifdef DCPOMATIC_OSX
+ align->Add (format, 0, wxTOP, 2);
+ table->Add (align, 0, wxALIGN_RIGHT | wxRIGHT, DCPOMATIC_SIZER_GAP - 2);
+#else
+ align->Add (format, 0, wxLEFT, DCPOMATIC_SIZER_GAP - 2);
+ table->Add (align, 0, wxTOP | wxRIGHT | wxALIGN_TOP, DCPOMATIC_SIZER_GAP);
+#endif
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";
_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
wxSizer* write_options = new wxBoxSizer(wxVERTICAL);
_write_flat = new wxRadioButton (this, wxID_ANY, _("Write all KDMs to the same folder"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
- write_options->Add (_write_flat);
+ write_options->Add (_write_flat, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
_write_folder = new wxRadioButton (this, wxID_ANY, _("Write a folder for each cinema's KDMs"));
- write_options->Add (_write_folder);
+ write_options->Add (_write_folder, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
_write_zip = new wxRadioButton (this, wxID_ANY, _("Write a ZIP file for each cinema's KDMs"));
- write_options->Add (_write_zip);
+ write_options->Add (_write_zip, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
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);
_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);
}
_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 ()
{
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<KDMWithMetadataPtr> kdms, string name, function<bool (boost::filesystem::path)> confirm_overwrite
)
{
- list<CinemaKDMs> const cinema_kdms = CinemaKDMs::collect (screen_kdms);
+ list<list<KDMWithMetadataPtr> > const cinema_kdms = collect (kdms);
/* Decide whether to proceed */
}
bool cinemas_with_no_email = false;
- BOOST_FOREACH (CinemaKDMs i, cinema_kdms) {
- if (i.cinema->emails.empty ()) {
+ for (auto i: cinema_kdms) {
+ if (i.front()->emails().empty()) {
cinemas_with_no_email = true;
}
}
if (proceed && Config::instance()->confirm_kdm_email ()) {
list<string> emails;
- BOOST_FOREACH (CinemaKDMs i, cinema_kdms) {
- BOOST_FOREACH (string j, i.cinema->emails) {
+ for (auto const& i: cinema_kdms) {
+ for (auto j: i.front()->emails()) {
emails.push_back (j);
}
}
shared_ptr<Job> job;
try {
- dcp::NameFormat::Map name_values;
- name_values['f'] = name;
- name_values['b'] = dcp::LocalTime(timing->from()).date() + " " + dcp::LocalTime(timing->from()).time_of_day(false, false);
- name_values['e'] = dcp::LocalTime(timing->until()).date() + " " + dcp::LocalTime(timing->until()).time_of_day(false, false);
if (_write_to->GetValue()) {
if (_write_flat->GetValue()) {
- written = ScreenKDM::write_files (
- screen_kdms,
+ written = write_files (
+ kdms,
directory(),
_filename_format->get(),
- name_values,
confirm_overwrite
);
} else if (_write_folder->GetValue()) {
- written = CinemaKDMs::write_directories (
- CinemaKDMs::collect (screen_kdms),
+ written = write_directories (
+ collect (kdms),
directory(),
_container_name_format->get(),
_filename_format->get(),
- name_values,
confirm_overwrite
);
} else if (_write_zip->GetValue()) {
- written = CinemaKDMs::write_zip_files (
- CinemaKDMs::collect (screen_kdms),
+ written = write_zip_files (
+ collect (kdms),
directory(),
_container_name_format->get(),
_filename_format->get(),
- name_values,
confirm_overwrite
);
}
cinema_kdms,
_container_name_format->get(),
_filename_format->get(),
- name_values,
- name,
- log
+ name
)
);
}
projects / dcpomatic.git / blobdiff