X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_cpl_panel.cc;h=f45fc529164f7ef760ebc39979335a13d067982f;hb=8a3d5a7729e10a901132ff00efbd5d80e38b2455;hp=96b9aa69745344c11a8bb55c1312e4e440e0e7c5;hpb=b6a6cda147625ccd09738cd338136ea5911a95e8;p=dcpomatic.git diff --git a/src/wx/kdm_cpl_panel.cc b/src/wx/kdm_cpl_panel.cc index 96b9aa697..f45fc5291 100644 --- a/src/wx/kdm_cpl_panel.cc +++ b/src/wx/kdm_cpl_panel.cc @@ -1,24 +1,31 @@ /* - Copyright (C) 2015 Carl Hetherington + Copyright (C) 2015-2021 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic 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, + DCP-o-matic 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. + along with DCP-o-matic. If not, see . */ #include "kdm_cpl_panel.h" #include "wx_util.h" +#include "static_text.h" +#include "dcpomatic_button.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS +#include +DCPOMATIC_ENABLE_WARNINGS #include using std::vector; @@ -27,34 +34,34 @@ KDMCPLPanel::KDMCPLPanel (wxWindow* parent, vector cpls) : wxPanel (parent, wxID_ANY) , _cpls (cpls) { - wxBoxSizer* vertical = new wxBoxSizer (wxVERTICAL); + auto vertical = new wxBoxSizer (wxVERTICAL); /* CPL choice */ - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - add_label_to_sizer (s, this, _("CPL"), true); + auto s = new wxBoxSizer (wxHORIZONTAL); + add_label_to_sizer (s, this, _("CPL"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); _cpl = new wxChoice (this, wxID_ANY); s->Add (_cpl, 1, wxEXPAND); - _cpl_browse = new wxButton (this, wxID_ANY, _("Browse...")); - s->Add (_cpl_browse, 0); + _cpl_browse = new Button (this, _("Browse...")); + s->Add (_cpl_browse, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP); vertical->Add (s, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP + 2); /* CPL details */ wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); add_label_to_sizer (table, this, _("DCP directory"), true); - _dcp_directory = new wxStaticText (this, wxID_ANY, ""); + _dcp_directory = new StaticText (this, ""); table->Add (_dcp_directory); add_label_to_sizer (table, this, _("CPL ID"), true); - _cpl_id = new wxStaticText (this, wxID_ANY, ""); + _cpl_id = new StaticText (this, ""); table->Add (_cpl_id); add_label_to_sizer (table, this, _("CPL annotation text"), true); - _cpl_annotation_text = new wxStaticText (this, wxID_ANY, ""); + _cpl_annotation_text = new StaticText (this, ""); table->Add (_cpl_annotation_text); vertical->Add (table, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP + 2); update_cpl_choice (); - _cpl->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&KDMCPLPanel::update_cpl_summary, this)); - _cpl_browse->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMCPLPanel::cpl_browse_clicked, this)); + _cpl->Bind (wxEVT_CHOICE, boost::bind (&KDMCPLPanel::update_cpl_summary, this)); + _cpl_browse->Bind (wxEVT_BUTTON, boost::bind (&KDMCPLPanel::cpl_browse_clicked, this)); SetSizerAndFit (vertical); } @@ -64,8 +71,8 @@ KDMCPLPanel::update_cpl_choice () { _cpl->Clear (); - for (vector::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) { - _cpl->Append (std_to_wx (i->cpl_id)); + for (auto const& i: _cpls) { + _cpl->Append (std_to_wx(i.cpl_id)); if (_cpls.size() > 0) { _cpl->SetSelection (0); @@ -85,7 +92,7 @@ KDMCPLPanel::update_cpl_summary () _dcp_directory->SetLabel (std_to_wx (_cpls[n].dcp_directory)); _cpl_id->SetLabel (std_to_wx (_cpls[n].cpl_id)); - _cpl_annotation_text->SetLabel (std_to_wx (_cpls[n].cpl_annotation_text)); + _cpl_annotation_text->SetLabel (std_to_wx(_cpls[n].cpl_annotation_text.get_value_or(""))); } void @@ -102,21 +109,48 @@ KDMCPLPanel::cpl_browse_clicked () d->Destroy (); - /* XXX: hack alert */ - cxml::Document cpl_document ("CompositionPlaylist"); - cpl_document.read_file (cpl_file); - try { + /* XXX: hack alert */ + cxml::Document cpl_document ("CompositionPlaylist"); + cpl_document.read_file (cpl_file); + + bool encrypted = false; + for (auto i: cpl_document.node_children("ReelList")) { + for (auto j: i->node_children("Reel")) { + for (auto k: j->node_children("AssetList")) { + for (auto l: k->node_children()) { + if (!l->node_children("KeyId").empty()) { + encrypted = true; + } + } + } + } + } + + if (!encrypted) { + error_dialog (this, _("This CPL contains no encrypted assets.")); + return; + } + + /* We're ignoring the CPLSummary timestamp stuff here and just putting the new one in at the end + of the list, then selecting it. + */ + _cpls.push_back ( CPLSummary ( dcp_dir.filename().string(), cpl_document.string_child("Id").substr (9), - cpl_document.string_child ("ContentTitleText"), - cpl_file + cpl_document.string_child("ContentTitleText"), + cpl_file, + encrypted, + 0 ) ); - } catch (cxml::Error) { - error_dialog (this, _("This is not a valid CPL file")); + } catch (xmlpp::exception& e) { + error_dialog (this, _("This is not a valid CPL file"), std_to_wx(e.what())); + return; + } catch (cxml::Error& e) { + error_dialog (this, _("This is not a valid CPL file"), std_to_wx(e.what())); return; }