/*
- Copyright (C) 2015-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#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 <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <libcxml/cxml.h>
using std::vector;
: 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, wxALIGN_CENTER_VERTICAL);
+ _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 */
{
_cpl->Clear ();
- for (vector<CPLSummary>::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);
_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
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;
}