From 9394ce6d3b840ec0af141d6435f394a5ad85c2ed Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 19 Nov 2015 15:57:42 +0000 Subject: [PATCH] Merge. --- ChangeLog | 4 ++ src/tools/dcpomatic.cc | 39 ++++++++++++ src/wx/kdm_dialog.cc | 4 -- src/wx/self_dkdm_dialog.cc | 120 +++++++++++++++++++++++++++++++++++++ src/wx/self_dkdm_dialog.h | 49 +++++++++++++++ src/wx/wscript | 1 + 6 files changed, 213 insertions(+), 4 deletions(-) create mode 100644 src/wx/self_dkdm_dialog.cc create mode 100644 src/wx/self_dkdm_dialog.h diff --git a/ChangeLog b/ChangeLog index c6925b822..8ed733c43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-11-19 c.hetherington + + * Add menu option to make a DKDM for DCP-o-matic (#755). + 2015-11-18 Carl Hetherington * Version 2.5.6 released. diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 4d74563eb..9a350f814 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -30,6 +30,7 @@ #include "wx/wx_signal_manager.h" #include "wx/about_dialog.h" #include "wx/kdm_dialog.h" +#include "wx/self_dkdm_dialog.h" #include "wx/servers_list_dialog.h" #include "wx/hints_dialog.h" #include "wx/update_dialog.h" @@ -138,6 +139,7 @@ enum { ID_content_scale_to_fit_height, ID_jobs_make_dcp, ID_jobs_make_kdms, + ID_jobs_make_self_dkdm, ID_jobs_send_dcp_to_tms, ID_jobs_show_dcp, ID_tools_video_waveform, @@ -202,6 +204,7 @@ public: Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::content_scale_to_fit_height, this), ID_content_scale_to_fit_height); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::jobs_make_dcp, this), ID_jobs_make_dcp); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::jobs_make_kdms, this), ID_jobs_make_kdms); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::jobs_make_self_dkdm, this), ID_jobs_make_self_dkdm); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::jobs_send_dcp_to_tms, this), ID_jobs_send_dcp_to_tms); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::jobs_show_dcp, this), ID_jobs_show_dcp); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::tools_video_waveform, this), ID_tools_video_waveform); @@ -479,6 +482,41 @@ private: d->Destroy (); } + void jobs_make_self_dkdm () + { + if (!_film) { + return; + } + + SelfDKDMDialog* d = new SelfDKDMDialog (this, _film); + if (d->ShowModal () != wxID_OK) { + d->Destroy (); + return; + } + + try { + dcp::EncryptedKDM kdm = _film->make_kdm ( + Config::instance()->decryption_chain()->leaf(), + vector (), + d->cpl (), + dcp::LocalTime ("2012-01-01T01:00:00+00:00"), + dcp::LocalTime ("2112-01-01T01:00:00+00:00"), + dcp::MODIFIED_TRANSITIONAL_1 + ); + + string const name = tidy_for_filename(_film->name()) + "_DKDM.kdm.xml"; + kdm.as_xml (d->directory() / name); + } 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.")); + } + + d->Destroy (); + } + void content_scale_to_fit_width () { VideoContentList vc = _film_editor->content_panel()->selected_video (); @@ -713,6 +751,7 @@ private: wxMenu* jobs_menu = new wxMenu; add_item (jobs_menu, _("&Make DCP\tCtrl-M"), ID_jobs_make_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION); add_item (jobs_menu, _("Make &KDMs...\tCtrl-K"), ID_jobs_make_kdms, NEEDS_FILM); + add_item (jobs_menu, _("Make DKDM for DCP-o-matic..."), ID_jobs_make_self_dkdm, NEEDS_FILM); add_item (jobs_menu, _("&Send DCP to TMS"), ID_jobs_send_dcp_to_tms, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL); add_item (jobs_menu, _("S&how DCP"), ID_jobs_show_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL); diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index a996463c5..7bd256d03 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -18,15 +18,11 @@ */ #include "kdm_dialog.h" -#include "cinema_dialog.h" -#include "screen_dialog.h" #include "wx_util.h" #include "screens_panel.h" #include "kdm_timing_panel.h" #include "kdm_output_panel.h" #include "kdm_cpl_panel.h" -#include "lib/cinema.h" -#include "lib/config.h" #include "lib/film.h" #include "lib/screen.h" #include diff --git a/src/wx/self_dkdm_dialog.cc b/src/wx/self_dkdm_dialog.cc new file mode 100644 index 000000000..fed233ad1 --- /dev/null +++ b/src/wx/self_dkdm_dialog.cc @@ -0,0 +1,120 @@ +/* + Copyright (C) 2012-2015 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include "self_dkdm_dialog.h" +#include "wx_util.h" +#include "kdm_output_panel.h" +#include "kdm_cpl_panel.h" +#include "lib/film.h" +#include "lib/screen.h" +#include +#ifdef DCPOMATIC_USE_OWN_PICKER +#include "dir_picker_ctrl.h" +#else +#include +#endif +#include +#include +#include +#include + +using std::string; +using std::map; +using std::list; +using std::pair; +using std::cout; +using std::vector; +using std::make_pair; +using boost::shared_ptr; + +SelfDKDMDialog::SelfDKDMDialog (wxWindow* parent, boost::shared_ptr film) + : wxDialog (parent, wxID_ANY, _("Make DKDM for DCP-o-matic")) +{ + /* Main sizer */ + wxBoxSizer* vertical = new wxBoxSizer (wxVERTICAL); + + /* Font for sub-headings */ + wxFont subheading_font (*wxNORMAL_FONT); + subheading_font.SetWeight (wxFONTWEIGHT_BOLD); + + /* Sub-heading: CPL */ + wxStaticText* h = new wxStaticText (this, wxID_ANY, _("CPL")); + h->SetFont (subheading_font); + vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2); + _cpl = new KDMCPLPanel (this, film->cpls ()); + vertical->Add (_cpl); + + /* Sub-heading: Output */ + h = new wxStaticText (this, wxID_ANY, _("Output")); + h->SetFont (subheading_font); + vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); + + wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + + add_label_to_sizer (table, this, _("Write to"), true); + +#ifdef DCPOMATIC_USE_OWN_PICKER + _folder = new DirPickerCtrl (this); +#else + _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1)); +#endif + + _folder->SetPath (wxStandardPaths::Get().GetDocumentsDir()); + + table->Add (_folder, 1, wxEXPAND); + + vertical->Add (table); + + /* Make an overall sizer to get a nice border, and put some buttons in */ + + wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); + overall_sizer->Add (vertical, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, DCPOMATIC_DIALOG_BORDER); + + wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL); + if (buttons) { + overall_sizer->Add (buttons, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP); + } + + setup_sensitivity (); + + SetSizer (overall_sizer); + overall_sizer->Layout (); + overall_sizer->SetSizeHints (this); +} + +void +SelfDKDMDialog::setup_sensitivity () +{ + wxButton* ok = dynamic_cast (FindWindowById (wxID_OK, this)); + if (ok) { + ok->Enable (_cpl->has_selected ()); + } +} + +boost::filesystem::path +SelfDKDMDialog::cpl () const +{ + return _cpl->cpl (); +} + +boost::filesystem::path +SelfDKDMDialog::directory () const +{ + return wx_to_std (_folder->GetPath ()); +} diff --git a/src/wx/self_dkdm_dialog.h b/src/wx/self_dkdm_dialog.h new file mode 100644 index 000000000..edf64132d --- /dev/null +++ b/src/wx/self_dkdm_dialog.h @@ -0,0 +1,49 @@ +/* + Copyright (C) 2012 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include "wx_util.h" +#include +#include +#include +#include +#include + +class Film; +class KDMCPLPanel; +class DirPickerCtrl; +class wxDirPickerCtrl; + +class SelfDKDMDialog : public wxDialog +{ +public: + SelfDKDMDialog (wxWindow *, boost::shared_ptr); + + boost::filesystem::path cpl () const; + boost::filesystem::path directory () const; + +private: + void setup_sensitivity (); + + KDMCPLPanel* _cpl; +#ifdef DCPOMATIC_USE_OWN_PICKER + DirPickerCtrl* _folder; +#else + wxDirPickerCtrl* _folder; +#endif +}; diff --git a/src/wx/wscript b/src/wx/wscript index 77fddc095..393cfcd39 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -71,6 +71,7 @@ sources = """ report_problem_dialog.cc screen_dialog.cc screens_panel.cc + self_dkdm_dialog.cc server_dialog.cc servers_list_dialog.cc subtitle_appearance_dialog.cc -- 2.30.2