X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fdcp.cc;h=53d5dd39843f27fd0b91a97b6bedcb0a2f118f74;hb=c4db5b5396c6401c63d80777a812e8adc642ce02;hp=3d64a8b7d5ea228608f3bbd03c1784c45708e980;hpb=9394dad74a8439f8230eb6aa21b639f3e10cbb2a;p=libdcp.git

diff --git a/src/dcp.cc b/src/dcp.cc
index 3d64a8b7..53d5dd39 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,158 +18,359 @@
 */
 
 /** @file  src/dcp.cc
- *  @brief A class to create a DCP.
+ *  @brief DCP class.
  */
 
-#include <sstream>
-#include <fstream>
-#include <iomanip>
-#include <cassert>
-#include <iostream>
-#include <boost/filesystem.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/lexical_cast.hpp>
-#include <libxml++/libxml++.h>
-#include <xmlsec/xmldsig.h>
-#include <xmlsec/app.h>
+#include "raw_convert.h"
 #include "dcp.h"
-#include "asset.h"
 #include "sound_asset.h"
 #include "picture_asset.h"
-#include "subtitle_asset.h"
+#include "interop_subtitle_asset.h"
+#include "smpte_subtitle_asset.h"
+#include "mono_picture_asset.h"
+#include "stereo_picture_asset.h"
+#include "reel_subtitle_asset.h"
 #include "util.h"
 #include "metadata.h"
 #include "exceptions.h"
-#include "parse/pkl.h"
-#include "parse/asset_map.h"
-#include "reel.h"
 #include "cpl.h"
-#include "signer.h"
-#include "kdm.h"
+#include "certificate_chain.h"
+#include "compose.hpp"
+#include "AS_DCP.h"
+#include "decrypted_kdm.h"
+#include "decrypted_kdm_key.h"
+#include "dcp_assert.h"
+#include "reel_asset.h"
+#include "font_asset.h"
+#include <xmlsec/xmldsig.h>
+#include <xmlsec/app.h>
+#include <libxml++/libxml++.h>
+#include <boost/filesystem.hpp>
+#include <boost/algorithm/string.hpp>
+#include <boost/foreach.hpp>
+#include <iostream>
 
 using std::string;
 using std::list;
-using std::stringstream;
-using std::ofstream;
+using std::cout;
 using std::ostream;
-using std::copy;
-using std::back_inserter;
 using std::make_pair;
+using std::map;
+using std::cout;
+using std::cerr;
+using std::exception;
 using boost::shared_ptr;
-using boost::lexical_cast;
-using namespace libdcp;
+using boost::dynamic_pointer_cast;
+using boost::algorithm::starts_with;
+using namespace dcp;
 
 DCP::DCP (boost::filesystem::path directory)
 	: _directory (directory)
 {
-	boost::filesystem::create_directories (directory);
+	if (!boost::filesystem::exists (directory)) {
+		boost::filesystem::create_directories (directory);
+	}
+
+	_directory = boost::filesystem::canonical (_directory);
+}
+
+template<class T> void
+survivable_error (bool keep_going, dcp::DCP::ReadErrors* errors, T const & e)
+{
+	if (keep_going) {
+		if (errors) {
+			errors->push_back (shared_ptr<T> (new T (e)));
+		}
+	} else {
+		throw e;
+	}
 }
 
 void
-DCP::write_xml (bool interop, XMLMetadata const & metadata, shared_ptr<const Signer> signer) const
+DCP::read (bool keep_going, ReadErrors* errors)
 {
-	for (list<shared_ptr<CPL> >::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) {
-		(*i)->write_xml (interop, metadata, signer);
+	/* Read the ASSETMAP */
+
+	boost::filesystem::path asset_map_file;
+	if (boost::filesystem::exists (_directory / "ASSETMAP")) {
+		asset_map_file = _directory / "ASSETMAP";
+	} else if (boost::filesystem::exists (_directory / "ASSETMAP.xml")) {
+		asset_map_file = _directory / "ASSETMAP.xml";
+	} else {
+		boost::throw_exception (DCPReadError (String::compose ("could not find AssetMap file in `%1'", _directory.string())));
+	}
+
+	cxml::Document asset_map ("AssetMap");
+	asset_map.read_file (asset_map_file);
+	list<shared_ptr<cxml::Node> > asset_nodes = asset_map.node_child("AssetList")->node_children ("Asset");
+	map<string, boost::filesystem::path> paths;
+	BOOST_FOREACH (shared_ptr<cxml::Node> i, asset_nodes) {
+		if (i->node_child("ChunkList")->node_children("Chunk").size() != 1) {
+			boost::throw_exception (XMLError ("unsupported asset chunk count"));
+		}
+		string p = i->node_child("ChunkList")->node_child("Chunk")->string_child ("Path");
+		if (starts_with (p, "file://")) {
+			p = p.substr (7);
+		}
+		paths.insert (make_pair (i->string_child ("Id"), p));
+	}
+
+	/* Read all the assets from the asset map */
+	/* XXX: I think we should be looking at the PKL here to decide type, not
+	   the extension of the file.
+	*/
+
+	/* Make a list of non-CPL assets so that we can resolve the references
+	   from the CPLs.
+	*/
+	list<shared_ptr<Asset> > other_assets;
+
+	for (map<string, boost::filesystem::path>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
+		boost::filesystem::path path = _directory / i->second;
+
+		if (!boost::filesystem::exists (path)) {
+			survivable_error (keep_going, errors, MissingAssetError (path));
+			continue;
+		}
+
+		if (boost::filesystem::extension (path) == ".xml") {
+			xmlpp::DomParser* p = new xmlpp::DomParser;
+			try {
+				p->parse_file (path.string());
+			} catch (std::exception& e) {
+				delete p;
+				continue;
+			}
+
+			string const root = p->get_document()->get_root_node()->get_name ();
+			delete p;
+
+			if (root == "CompositionPlaylist") {
+				_cpls.push_back (shared_ptr<CPL> (new CPL (path)));
+			} else if (root == "DCSubtitle") {
+				other_assets.push_back (shared_ptr<InteropSubtitleAsset> (new InteropSubtitleAsset (path)));
+			}
+		} else if (boost::filesystem::extension (path) == ".mxf") {
+			ASDCP::EssenceType_t type;
+			if (ASDCP::EssenceType (path.string().c_str(), type) != ASDCP::RESULT_OK) {
+				throw DCPReadError ("Could not find essence type");
+			}
+			switch (type) {
+				case ASDCP::ESS_UNKNOWN:
+				case ASDCP::ESS_MPEG2_VES:
+					throw DCPReadError ("MPEG2 video essences are not supported");
+				case ASDCP::ESS_JPEG_2000:
+					other_assets.push_back (shared_ptr<MonoPictureAsset> (new MonoPictureAsset (path)));
+					break;
+				case ASDCP::ESS_PCM_24b_48k:
+				case ASDCP::ESS_PCM_24b_96k:
+					other_assets.push_back (shared_ptr<SoundAsset> (new SoundAsset (path)));
+					break;
+				case ASDCP::ESS_JPEG_2000_S:
+					other_assets.push_back (shared_ptr<StereoPictureAsset> (new StereoPictureAsset (path)));
+					break;
+				case ASDCP::ESS_TIMED_TEXT:
+					other_assets.push_back (shared_ptr<SMPTESubtitleAsset> (new SMPTESubtitleAsset (path)));
+					break;
+				default:
+					throw DCPReadError ("Unknown MXF essence type");
+			}
+		} else if (boost::filesystem::extension (path) == ".ttf") {
+			other_assets.push_back (shared_ptr<FontAsset> (new FontAsset (i->first, path)));
+		}
 	}
 
-	string pkl_uuid = make_uuid ();
-	string pkl_path = write_pkl (pkl_uuid, interop, metadata, signer);
-	
-	write_volindex ();
-	write_assetmap (pkl_uuid, boost::filesystem::file_size (pkl_path), interop, metadata);
+	BOOST_FOREACH (shared_ptr<CPL> i, cpls ()) {
+		i->resolve_refs (list_of_type<Asset, Object> (other_assets));
+	}
+}
+
+bool
+DCP::equals (DCP const & other, EqualityOptions opt, NoteHandler note) const
+{
+	list<shared_ptr<CPL> > a = cpls ();
+	list<shared_ptr<CPL> > b = other.cpls ();
+
+	if (a.size() != b.size()) {
+		note (DCP_ERROR, String::compose ("CPL counts differ: %1 vs %2", a.size(), b.size()));
+		return false;
+	}
+
+	bool r = true;
+
+	BOOST_FOREACH (shared_ptr<CPL> i, a) {
+		list<shared_ptr<CPL> >::const_iterator j = b.begin ();
+		while (j != b.end() && !(*j)->equals (i, opt, note)) {
+			++j;
+		}
+
+		if (j == b.end ()) {
+			r = false;
+		}
+	}
+
+	return r;
+}
+
+void
+DCP::add (boost::shared_ptr<CPL> cpl)
+{
+	_cpls.push_back (cpl);
+}
+
+bool
+DCP::encrypted () const
+{
+	BOOST_FOREACH (shared_ptr<CPL> i, cpls ()) {
+		if (i->encrypted ()) {
+			return true;
+		}
+	}
+
+	return false;
 }
 
-std::string
-DCP::write_pkl (string pkl_uuid, bool interop, XMLMetadata const & metadata, shared_ptr<const Signer> signer) const
+void
+DCP::add (DecryptedKDM const & kdm)
 {
-	assert (!_cpls.empty ());
-	
-	boost::filesystem::path p;
-	p /= _directory;
-	stringstream s;
-	s << pkl_uuid << "_pkl.xml";
-	p /= s.str();
+	list<DecryptedKDMKey> keys = kdm.keys ();
+
+	BOOST_FOREACH (shared_ptr<CPL> i, cpls ()) {
+		BOOST_FOREACH (DecryptedKDMKey const & j, kdm.keys ()) {
+			if (j.cpl_id() == i->id()) {
+				i->add (kdm);
+			}
+		}
+	}
+}
+
+boost::filesystem::path
+DCP::write_pkl (Standard standard, string pkl_uuid, XMLMetadata metadata, shared_ptr<const CertificateChain> signer) const
+{
+	boost::filesystem::path p = _directory;
+	p /= String::compose ("pkl_%1.xml", pkl_uuid);
 
 	xmlpp::Document doc;
 	xmlpp::Element* pkl;
-	if (interop) {
+	if (standard == INTEROP) {
 		pkl = doc.create_root_node("PackingList", "http://www.digicine.com/PROTO-ASDCP-PKL-20040311#");
 	} else {
 		pkl = doc.create_root_node("PackingList", "http://www.smpte-ra.org/schemas/429-8/2007/PKL");
 	}
-	
+
 	if (signer) {
 		pkl->set_namespace_declaration ("http://www.w3.org/2000/09/xmldsig#", "dsig");
 	}
 
 	pkl->add_child("Id")->add_child_text ("urn:uuid:" + pkl_uuid);
+
 	/* XXX: this is a bit of a hack */
-	pkl->add_child("AnnotationText")->add_child_text(_cpls.front()->name());
+	DCP_ASSERT (cpls().size() > 0);
+	pkl->add_child("AnnotationText")->add_child_text (cpls().front()->annotation_text ());
+
 	pkl->add_child("IssueDate")->add_child_text (metadata.issue_date);
 	pkl->add_child("Issuer")->add_child_text (metadata.issuer);
 	pkl->add_child("Creator")->add_child_text (metadata.creator);
 
 	xmlpp::Element* asset_list = pkl->add_child("AssetList");
-	list<shared_ptr<const Asset> > a = assets ();
-	for (list<shared_ptr<const Asset> >::const_iterator i = a.begin(); i != a.end(); ++i) {
-		(*i)->write_to_pkl (asset_list);
-	}
-	
-	for (list<shared_ptr<CPL> >::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) {
-		(*i)->write_to_pkl (asset_list);
+	BOOST_FOREACH (shared_ptr<Asset> i, assets ()) {
+		i->write_to_pkl (asset_list, _directory, standard);
 	}
 
 	if (signer) {
-		signer->sign (pkl, interop);
+		signer->sign (pkl, standard);
 	}
-		
+
 	doc.write_to_file (p.string (), "UTF-8");
 	return p.string ();
 }
 
+/** Write the VOLINDEX file.
+ *  @param standard DCP standard to use (INTEROP or SMPTE)
+ */
 void
-DCP::write_volindex () const
+DCP::write_volindex (Standard standard) const
 {
-	boost::filesystem::path p;
-	p /= _directory;
-	p /= "VOLINDEX.xml";
+	boost::filesystem::path p = _directory;
+	switch (standard) {
+	case INTEROP:
+		p /= "VOLINDEX";
+		break;
+	case SMPTE:
+		p /= "VOLINDEX.xml";
+		break;
+	default:
+		DCP_ASSERT (false);
+	}
 
 	xmlpp::Document doc;
-	xmlpp::Element* root = doc.create_root_node ("VolumeIndex", "http://www.smpte-ra.org/schemas/429-9/2007/AM");
+	xmlpp::Element* root;
+
+	switch (standard) {
+	case INTEROP:
+		root = doc.create_root_node ("VolumeIndex", "http://www.digicine.com/PROTO-ASDCP-AM-20040311#");
+		break;
+	case SMPTE:
+		root = doc.create_root_node ("VolumeIndex", "http://www.smpte-ra.org/schemas/429-9/2007/AM");
+		break;
+	default:
+		DCP_ASSERT (false);
+	}
+
 	root->add_child("Index")->add_child_text ("1");
 	doc.write_to_file (p.string (), "UTF-8");
 }
 
 void
-DCP::write_assetmap (string pkl_uuid, int pkl_length, bool interop, XMLMetadata const & metadata) const
+DCP::write_assetmap (Standard standard, string pkl_uuid, int pkl_length, XMLMetadata metadata) const
 {
-	boost::filesystem::path p;
-	p /= _directory;
-	p /= "ASSETMAP.xml";
+	boost::filesystem::path p = _directory;
+
+	switch (standard) {
+	case INTEROP:
+		p /= "ASSETMAP";
+		break;
+	case SMPTE:
+		p /= "ASSETMAP.xml";
+		break;
+	default:
+		DCP_ASSERT (false);
+	}
 
 	xmlpp::Document doc;
 	xmlpp::Element* root;
-	if (interop) {
+
+	switch (standard) {
+	case INTEROP:
 		root = doc.create_root_node ("AssetMap", "http://www.digicine.com/PROTO-ASDCP-AM-20040311#");
-	} else {
+		break;
+	case SMPTE:
 		root = doc.create_root_node ("AssetMap", "http://www.smpte-ra.org/schemas/429-9/2007/AM");
+		break;
+	default:
+		DCP_ASSERT (false);
 	}
 
 	root->add_child("Id")->add_child_text ("urn:uuid:" + make_uuid());
 	root->add_child("AnnotationText")->add_child_text ("Created by " + metadata.creator);
-	if (interop) {
+
+	switch (standard) {
+	case INTEROP:
 		root->add_child("VolumeCount")->add_child_text ("1");
 		root->add_child("IssueDate")->add_child_text (metadata.issue_date);
 		root->add_child("Issuer")->add_child_text (metadata.issuer);
 		root->add_child("Creator")->add_child_text (metadata.creator);
-	} else {
+		break;
+	case SMPTE:
 		root->add_child("Creator")->add_child_text (metadata.creator);
 		root->add_child("VolumeCount")->add_child_text ("1");
 		root->add_child("IssueDate")->add_child_text (metadata.issue_date);
 		root->add_child("Issuer")->add_child_text (metadata.issuer);
+		break;
+	default:
+		DCP_ASSERT (false);
 	}
-		
+
 	xmlpp::Node* asset_list = root->add_child ("AssetList");
 
 	xmlpp::Node* asset = asset_list->add_child ("Asset");
@@ -177,192 +378,66 @@ DCP::write_assetmap (string pkl_uuid, int pkl_length, bool interop, XMLMetadata
 	asset->add_child("PackingList")->add_child_text ("true");
 	xmlpp::Node* chunk_list = asset->add_child ("ChunkList");
 	xmlpp::Node* chunk = chunk_list->add_child ("Chunk");
-	chunk->add_child("Path")->add_child_text (pkl_uuid + "_pkl.xml");
+	chunk->add_child("Path")->add_child_text ("pkl_" + pkl_uuid + ".xml");
 	chunk->add_child("VolumeIndex")->add_child_text ("1");
 	chunk->add_child("Offset")->add_child_text ("0");
-	chunk->add_child("Length")->add_child_text (lexical_cast<string> (pkl_length));
-	
-	for (list<shared_ptr<CPL> >::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) {
-		(*i)->write_to_assetmap (asset_list);
-	}
+	chunk->add_child("Length")->add_child_text (raw_convert<string> (pkl_length));
 
-	list<shared_ptr<const Asset> > a = assets ();
-	for (list<shared_ptr<const Asset> >::const_iterator i = a.begin(); i != a.end(); ++i) {
-		(*i)->write_to_assetmap (asset_list);
+	BOOST_FOREACH (shared_ptr<Asset> i, assets ()) {
+		i->write_to_assetmap (asset_list, _directory);
 	}
 
 	/* This must not be the _formatted version otherwise signature digests will be wrong */
 	doc.write_to_file (p.string (), "UTF-8");
 }
 
+/** Write all the XML files for this DCP.
+ *  @param standand INTEROP or SMPTE.
+ *  @param metadata Metadata to use for PKL and asset map files.
+ *  @param signer Signer to use, or 0.
+ */
 void
-DCP::read (bool require_mxfs)
-{
-	read_assets ();
-	read_cpls (require_mxfs);
-}
-
-void
-DCP::read_assets ()
-{
-	shared_ptr<parse::AssetMap> asset_map;
-	try {
-		boost::filesystem::path p = _directory;
-		p /= "ASSETMAP";
-		if (boost::filesystem::exists (p)) {
-			asset_map.reset (new libdcp::parse::AssetMap (p.string ()));
-		} else {
-			p = _directory;
-			p /= "ASSETMAP.xml";
-			if (boost::filesystem::exists (p)) {
-				asset_map.reset (new libdcp::parse::AssetMap (p.string ()));
-			} else {
-				boost::throw_exception (DCPReadError ("could not find AssetMap file"));
-			}
-		}
-		
-	} catch (FileError& e) {
-		boost::throw_exception (FileError ("could not load AssetMap file", _files.asset_map));
-	}
-
-	for (list<shared_ptr<libdcp::parse::AssetMapAsset> >::const_iterator i = asset_map->assets.begin(); i != asset_map->assets.end(); ++i) {
-		if ((*i)->chunks.size() != 1) {
-			boost::throw_exception (XMLError ("unsupported asset chunk count"));
-		}
-
-		boost::filesystem::path t = _directory;
-		t /= (*i)->chunks.front()->path;
-		
-		if (boost::algorithm::ends_with (t.string(), ".mxf") || boost::algorithm::ends_with (t.string(), ".ttf")) {
-			continue;
-		}
-
-		xmlpp::DomParser* p = new xmlpp::DomParser;
-		try {
-			p->parse_file (t.string());
-		} catch (std::exception& e) {
-			delete p;
-			continue;
-		}
-
-		string const root = p->get_document()->get_root_node()->get_name ();
-		delete p;
-
-		if (root == "CompositionPlaylist") {
-			_files.cpls.push_back (t.string());
-		} else if (root == "PackingList") {
-			if (_files.pkl.empty ()) {
-				_files.pkl = t.string();
-			} else {
-				boost::throw_exception (DCPReadError ("duplicate PKLs found"));
-			}
-		}
-	}
-	
-	if (_files.cpls.empty ()) {
-		boost::throw_exception (FileError ("no CPL files found", ""));
-	}
-
-	if (_files.pkl.empty ()) {
-		boost::throw_exception (FileError ("no PKL file found", ""));
-	}
-
-	shared_ptr<parse::PKL> pkl;
-	try {
-		pkl.reset (new parse::PKL (_files.pkl));
-	} catch (FileError& e) {
-		boost::throw_exception (FileError ("could not load PKL file", _files.pkl));
-	}
-
-	_asset_maps.push_back (make_pair (boost::filesystem::absolute (_directory).string(), asset_map));
-}
-
-void
-DCP::read_cpls (bool require_mxfs)
+DCP::write_xml (
+	Standard standard,
+	XMLMetadata metadata,
+	shared_ptr<const CertificateChain> signer
+	)
 {
-	for (list<string>::iterator i = _files.cpls.begin(); i != _files.cpls.end(); ++i) {
-		_cpls.push_back (shared_ptr<CPL> (new CPL (_directory, *i, _asset_maps, require_mxfs)));
+	BOOST_FOREACH (shared_ptr<CPL> i, cpls ()) {
+		string const filename = "cpl_" + i->id() + ".xml";
+		i->write_xml (_directory / filename, standard, signer);
 	}
-}
 
-bool
-DCP::equals (DCP const & other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
-{
-	if (_cpls.size() != other._cpls.size()) {
-		note (ERROR, "CPL counts differ");
-		return false;
-	}
-
-	list<shared_ptr<CPL> >::const_iterator a = _cpls.begin ();
-	list<shared_ptr<CPL> >::const_iterator b = other._cpls.begin ();
-
-	while (a != _cpls.end ()) {
-		if (!(*a)->equals (*b->get(), opt, note)) {
-			return false;
-		}
-		++a;
-		++b;
-	}
+	string const pkl_uuid = make_uuid ();
+	boost::filesystem::path const pkl_path = write_pkl (standard, pkl_uuid, metadata, signer);
 
-	return true;
+	write_volindex (standard);
+	write_assetmap (standard, pkl_uuid, boost::filesystem::file_size (pkl_path), metadata);
 }
 
-void
-DCP::add_cpl (shared_ptr<CPL> cpl)
+list<shared_ptr<CPL> >
+DCP::cpls () const
 {
-	_cpls.push_back (cpl);
+	return _cpls;
 }
 
-class AssetComparator
-{
-public:
-	bool operator() (shared_ptr<const Asset> a, shared_ptr<const Asset> b) {
-		return a->uuid() < b->uuid();
-	}
-};
-
-list<shared_ptr<const Asset> >
+/** @return All assets (including CPLs) */
+list<shared_ptr<Asset> >
 DCP::assets () const
 {
-	list<shared_ptr<const Asset> > a;
-	for (list<shared_ptr<CPL> >::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) {
-		list<shared_ptr<const Asset> > t = (*i)->assets ();
-		a.merge (t);
-	}
-
-	a.sort (AssetComparator ());
-	a.unique ();
-	return a;
-}
-
-bool
-DCP::encrypted () const
-{
-	for (list<shared_ptr<CPL> >::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) {
-		if ((*i)->encrypted ()) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
-void
-DCP::add_kdm (KDM const & kdm)
-{
-	list<KDMKey> keys = kdm.keys ();
-	
-	for (list<shared_ptr<CPL> >::iterator i = _cpls.begin(); i != _cpls.end(); ++i) {
-		for (list<KDMKey>::iterator j = keys.begin(); j != keys.end(); ++j) {
-			if (j->cpl_id() == (*i)->id()) {
-				(*i)->add_kdm (kdm);
-			}				
+	list<shared_ptr<Asset> > assets;
+	BOOST_FOREACH (shared_ptr<CPL> i, cpls ()) {
+		assets.push_back (i);
+		BOOST_FOREACH (shared_ptr<const ReelAsset> j, i->reel_assets ()) {
+			shared_ptr<Asset> o = j->asset_ref().object ();
+			assets.push_back (o);
+			/* More Interop special-casing */
+			shared_ptr<InteropSubtitleAsset> sub = dynamic_pointer_cast<InteropSubtitleAsset> (o);
+			if (sub) {
+				sub->add_font_assets (assets);
+			}
 		}
 	}
-}
 
-void
-DCP::add_assets_from (DCP const & ov)
-{
-	copy (ov._asset_maps.begin(), ov._asset_maps.end(), back_inserter (_asset_maps));
+	return assets;
 }