X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_output_panel.cc;h=35ce4fc278a76d1c37d2387f5e2fd4f92aeff771;hb=1a7c50245309bb0b99001940b2203a267de942ca;hp=181ca74f4008cd897b75861eaba37d676534677f;hpb=006e38346a8bcdcc889979b7c00802d9bb8fc6f8;p=dcpomatic.git diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index 181ca74f4..35ce4fc27 100644 --- a/src/wx/kdm_output_panel.cc +++ b/src/wx/kdm_output_panel.cc @@ -18,10 +18,6 @@ */ -#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" @@ -30,14 +26,22 @@ #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 #include #ifdef DCPOMATIC_USE_OWN_PICKER #include "dir_picker_ctrl.h" #else +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS #endif +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS using std::pair; using std::string; @@ -46,15 +50,21 @@ using std::exception; using std::make_pair; using boost::shared_ptr; using boost::function; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + 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); + 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); @@ -111,11 +121,11 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) 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); @@ -160,10 +170,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,10 +192,10 @@ KDMOutputPanel::kdm_write_type_changed () pair, int> KDMOutputPanel::make ( - list > screen_kdms, string name, KDMTimingPanel* timing, function confirm_overwrite + list kdms, string name, function confirm_overwrite ) { - list const cinema_kdms = CinemaKDMs::collect (screen_kdms); + list > const cinema_kdms = collect (kdms); /* Decide whether to proceed */ @@ -198,8 +209,8 @@ KDMOutputPanel::make ( } bool cinemas_with_no_email = false; - BOOST_FOREACH (CinemaKDMs i, cinema_kdms) { - if (i.cinema->emails.empty ()) { + BOOST_FOREACH (list i, cinema_kdms) { + if (i.front()->emails().empty()) { cinemas_with_no_email = true; } } @@ -213,8 +224,8 @@ KDMOutputPanel::make ( if (proceed && Config::instance()->confirm_kdm_email ()) { list emails; - BOOST_FOREACH (CinemaKDMs i, cinema_kdms) { - BOOST_FOREACH (string j, i.cinema->emails) { + BOOST_FOREACH (list const& i, cinema_kdms) { + BOOST_FOREACH (string j, i.front()->emails()) { emails.push_back (j); } } @@ -238,36 +249,29 @@ KDMOutputPanel::make ( shared_ptr 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 ); } @@ -279,7 +283,6 @@ KDMOutputPanel::make ( cinema_kdms, _container_name_format->get(), _filename_format->get(), - name_values, name ) );