X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_cpl_panel.cc;h=f45fc529164f7ef760ebc39979335a13d067982f;hb=877ff606a7b604b3817b4535a40cc5e2f0aa8e87;hp=4151f84a7b252adbb69a4ff123cef3b0bdc900d5;hpb=fdc416faa317106d05be8fe5226ded84d8347d99;p=dcpomatic.git

diff --git a/src/wx/kdm_cpl_panel.cc b/src/wx/kdm_cpl_panel.cc
index 4151f84a7..f45fc5291 100644
--- a/src/wx/kdm_cpl_panel.cc
+++ b/src/wx/kdm_cpl_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,8 +22,11 @@
 #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>
-#include <boost/foreach.hpp>
 
 using std::vector;
 
@@ -31,15 +34,15 @@ 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 */
@@ -68,7 +71,7 @@ KDMCPLPanel::update_cpl_choice ()
 {
 	_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) {
@@ -89,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
@@ -106,40 +109,48 @@ KDMCPLPanel::cpl_browse_clicked ()
 
 	d->Destroy ();
 
-	/* XXX: hack alert */
-	cxml::Document cpl_document ("CompositionPlaylist");
-	cpl_document.read_file (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()) {
-					if (!l->node_children("KeyId").empty()) {
-						encrypted = true;
+	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;
-	}
+		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.
+		*/
 
-	try {
 		_cpls.push_back (
 			CPLSummary (
 				dcp_dir.filename().string(),
 				cpl_document.string_child("Id").substr (9),
 				cpl_document.string_child("ContentTitleText"),
 				cpl_file,
-				encrypted
+				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;
 	}