/*
- Copyright (C) 2015-2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
+#include "dcpomatic_button.h"
#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 "wx_util.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
#include <libcxml/cxml.h>
-#include <boost/foreach.hpp>
+
using std::vector;
+
KDMCPLPanel::KDMCPLPanel (wxWindow* parent, vector<CPLSummary> 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 Button (this, _("Browse..."));
- s->Add (_cpl_browse, 0, wxALIGN_CENTER_VERTICAL);
+ 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);
+ auto table = new wxFlexGridSizer(2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
add_label_to_sizer (table, this, _("DCP directory"), true);
_dcp_directory = new StaticText (this, "");
table->Add (_dcp_directory);
update_cpl_choice ();
- _cpl->Bind (wxEVT_CHOICE, boost::bind (&KDMCPLPanel::update_cpl_summary, this));
- _cpl_browse->Bind (wxEVT_BUTTON, 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);
}
{
_cpl->Clear ();
- BOOST_FOREACH (CPLSummary const & i, _cpls) {
+ for (auto const& i: _cpls) {
_cpl->Append (std_to_wx(i.cpl_id));
if (_cpls.size() > 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("")));
+
+ Changed();
}
void
KDMCPLPanel::cpl_browse_clicked ()
{
- wxFileDialog* d = new wxFileDialog (this, _("Select CPL XML file"), wxEmptyString, wxEmptyString, "*.xml");
+ auto d = make_wx<wxFileDialog>(this, _("Select CPL XML file"), wxEmptyString, wxEmptyString, "*.xml");
if (d->ShowModal() == wxID_CANCEL) {
- d->Destroy ();
return;
}
boost::filesystem::path cpl_file (wx_to_std (d->GetPath ()));
boost::filesystem::path dcp_dir = cpl_file.parent_path ();
- d->Destroy ();
-
try {
/* XXX: hack alert */
cxml::Document cpl_document ("CompositionPlaylist");
- cpl_document.read_file (cpl_file);
+ cpl_document.read_file(dcp::filesystem::fix_long_path(cpl_file));
bool encrypted = false;
- BOOST_FOREACH (cxml::ConstNodePtr i, cpl_document.node_children("ReelList")) {
- BOOST_FOREACH (cxml::ConstNodePtr j, i->node_children("Reel")) {
- BOOST_FOREACH (cxml::ConstNodePtr k, j->node_children("AssetList")) {
- BOOST_FOREACH (cxml::ConstNodePtr l, k->node_children()) {
+ 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;
}