X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fkdm_cpl_panel.cc;h=8b4d93129dcd7d7a84e677a64748ea2f722ebb6e;hp=d710d88aaef571aa3d4d24501faafb6ce1747283;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hpb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94

diff --git a/src/wx/kdm_cpl_panel.cc b/src/wx/kdm_cpl_panel.cc
index d710d88aa..8b4d93129 100644
--- a/src/wx/kdm_cpl_panel.cc
+++ b/src/wx/kdm_cpl_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,7 +21,9 @@
 #include "kdm_cpl_panel.h"
 #include "wx_util.h"
 #include "static_text.h"
+#include "dcpomatic_button.h"
 #include <libcxml/cxml.h>
+#include <boost/foreach.hpp>
 
 using std::vector;
 
@@ -36,7 +38,7 @@ KDMCPLPanel::KDMCPLPanel (wxWindow* parent, vector<CPLSummary> cpls)
 	add_label_to_sizer (s, this, _("CPL"), true);
 	_cpl = new wxChoice (this, wxID_ANY);
 	s->Add (_cpl, 1, wxEXPAND);
-	_cpl_browse = new wxButton (this, wxID_ANY, _("Browse..."));
+	_cpl_browse = new Button (this, _("Browse..."));
 	s->Add (_cpl_browse, 0, wxALIGN_CENTER_VERTICAL);
 	vertical->Add (s, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP + 2);
 
@@ -66,8 +68,8 @@ KDMCPLPanel::update_cpl_choice ()
 {
 	_cpl->Clear ();
 
-	for (vector<CPLSummary>::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) {
-		_cpl->Append (std_to_wx (i->cpl_id));
+	BOOST_FOREACH (CPLSummary const & i, _cpls) {
+		_cpl->Append (std_to_wx(i.cpl_id));
 
 		if (_cpls.size() > 0) {
 			_cpl->SetSelection (0);
@@ -108,16 +110,40 @@ KDMCPLPanel::cpl_browse_clicked ()
 	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;
+					}
+				}
+			}
+		}
+	}
+
+	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
+				cpl_document.string_child("ContentTitleText"),
+				cpl_file,
+				encrypted,
+				0
 				)
 			);
-	} catch (cxml::Error) {
+	} catch (cxml::Error &) {
 		error_dialog (this, _("This is not a valid CPL file"));
 		return;
 	}