X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fdcp.cc;h=2929b5d85bf81d45c2cdec4e92c10d6a60446e83;hb=f77a03cc3ec0c5f917e0a2b6cf7599d035b34cff;hp=ae69225616a07d4ed276859c14f9032e67f28031;hpb=71de90f74085744d1c5ca35253eec003e41497a2;p=libdcp.git diff --git a/src/dcp.cc b/src/dcp.cc index ae692256..2929b5d8 100644 --- a/src/dcp.cc +++ b/src/dcp.cc @@ -1,186 +1,432 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of libdcp. + + libdcp is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + libdcp is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + along with libdcp. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations + including the two. + + You must obey the GNU General Public License in all respects + for all of the code used other than OpenSSL. If you modify + file(s) with this exception, you may extend this exception to your + version of the file(s), but you are not obligated to do so. If you + do not wish to do so, delete this exception statement from your + version. If you delete this exception statement from all source + files in the program, then also delete it here. */ /** @file src/dcp.cc - * @brief A class to create a DCP. + * @brief DCP class. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "raw_convert.h" #include "dcp.h" -#include "asset.h" #include "sound_asset.h" +#include "atmos_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 "decrypted_kdm.h" +#include "decrypted_kdm_key.h" +#include "dcp_assert.h" +#include "reel_asset.h" +#include "font_asset.h" +#include "pkl.h" +#include "asset_factory.h" +#include "verify.h" +#include +#include +#include +#include +#include +#include +#include using std::string; using std::list; -using std::stringstream; -using std::ostream; -using std::copy; -using std::back_inserter; +using std::vector; +using std::cout; using std::make_pair; +using std::map; +using std::cerr; +using std::exception; using boost::shared_ptr; -using boost::lexical_cast; -using namespace libdcp; +using boost::dynamic_pointer_cast; +using boost::optional; +using boost::algorithm::starts_with; +using namespace dcp; + +static string const assetmap_interop_ns = "http://www.digicine.com/PROTO-ASDCP-AM-20040311#"; +static string const assetmap_smpte_ns = "http://www.smpte-ra.org/schemas/429-9/2007/AM"; +static string const volindex_interop_ns = "http://www.digicine.com/PROTO-ASDCP-VL-20040311#"; +static string const volindex_smpte_ns = "http://www.smpte-ra.org/schemas/429-9/2007/AM"; 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); } +/** Read a DCP. This method does not do any deep checking of the DCP's validity, but + * if it comes across any bad things it will do one of two things. + * + * Errors that are so serious that they prevent the method from working will result + * in an exception being thrown. For example, a missing ASSETMAP means that the DCP + * can't be read without a lot of guesswork, so this will throw. + * + * Errors that are not fatal will be added to notes, if it's non-0. For example, + * if the DCP contains a mixture of Interop and SMPTE elements this will result + * in a note being added to the list. + */ void -DCP::write_xml (bool interop, XMLMetadata const & metadata, shared_ptr signer) const +DCP::read (list* notes, bool ignore_incorrect_picture_mxf_type) { - for (list >::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) { - (*i)->write_xml (interop, metadata, signer); + /* Read the ASSETMAP and PKL */ + + if (boost::filesystem::exists (_directory / "ASSETMAP")) { + _asset_map = _directory / "ASSETMAP"; + } else if (boost::filesystem::exists (_directory / "ASSETMAP.xml")) { + _asset_map = _directory / "ASSETMAP.xml"; + } else { + boost::throw_exception (ReadError (String::compose ("could not find ASSETMAP nor ASSETMAP.xml in `%1'", _directory.string()))); + } + + cxml::Document asset_map ("AssetMap"); + + asset_map.read_file (_asset_map.get()); + if (asset_map.namespace_uri() == assetmap_interop_ns) { + _standard = INTEROP; + } else if (asset_map.namespace_uri() == assetmap_smpte_ns) { + _standard = SMPTE; + } else { + boost::throw_exception (XMLError ("Unrecognised Assetmap namespace " + asset_map.namespace_uri())); + } + + list > asset_nodes = asset_map.node_child("AssetList")->node_children ("Asset"); + map paths; + list pkl_paths; + BOOST_FOREACH (shared_ptr 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); + } + switch (*_standard) { + case INTEROP: + if (i->optional_node_child("PackingList")) { + pkl_paths.push_back (p); + } else { + paths.insert (make_pair (remove_urn_uuid (i->string_child ("Id")), p)); + } + break; + case SMPTE: + { + optional pkl_bool = i->optional_string_child("PackingList"); + if (pkl_bool && *pkl_bool == "true") { + pkl_paths.push_back (p); + } else { + paths.insert (make_pair (remove_urn_uuid (i->string_child ("Id")), p)); + } + break; + } + } + } + + if (pkl_paths.empty()) { + boost::throw_exception (XMLError ("No packing lists found in asset map")); + } + + BOOST_FOREACH (boost::filesystem::path i, pkl_paths) { + _pkls.push_back (shared_ptr(new PKL(_directory / i))); + } + + /* Now we have: + paths - map of files in the DCP that are not PKLs; key is ID, value is path. + _pkls - PKL objects for each PKL. + + Read all the assets from the asset map. + */ + + /* Make a list of non-CPL/PKL assets so that we can resolve the references + from the CPLs. + */ + list > other_assets; + + for (map::const_iterator i = paths.begin(); i != paths.end(); ++i) { + boost::filesystem::path path = _directory / i->second; + + if (i->second.empty()) { + /* I can't see how this is valid, but it's + been seen in the wild with a DCP that + claims to come from ClipsterDCI 5.10.0.5. + */ + if (notes) { + notes->push_back (VerificationNote(VerificationNote::VERIFY_WARNING, VerificationNote::EMPTY_ASSET_PATH)); + } + continue; + } + + if (!boost::filesystem::exists(path)) { + if (notes) { + notes->push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::MISSING_ASSET, path)); + } + continue; + } + + /* Find the for this asset from the PKL that contains the asset */ + optional pkl_type; + BOOST_FOREACH (shared_ptr j, _pkls) { + pkl_type = j->type(i->first); + if (pkl_type) { + break; + } + } + + DCP_ASSERT (pkl_type); + + if (*pkl_type == CPL::static_pkl_type(*_standard) || *pkl_type == InteropSubtitleAsset::static_pkl_type(*_standard)) { + xmlpp::DomParser* p = new xmlpp::DomParser; + try { + p->parse_file (path.string()); + } catch (std::exception& e) { + delete p; + throw ReadError(String::compose("XML error in %1", path.string()), e.what()); + } + + string const root = p->get_document()->get_root_node()->get_name (); + delete p; + + if (root == "CompositionPlaylist") { + shared_ptr cpl (new CPL (path)); + if (_standard && cpl->standard() && cpl->standard().get() != _standard.get() && notes) { + notes->push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::MISMATCHED_STANDARD)); + } + _cpls.push_back (cpl); + } else if (root == "DCSubtitle") { + if (_standard && _standard.get() == SMPTE) { + notes->push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::MISMATCHED_STANDARD)); + } + other_assets.push_back (shared_ptr (new InteropSubtitleAsset (path))); + } + } else if ( + *pkl_type == PictureAsset::static_pkl_type(*_standard) || + *pkl_type == SoundAsset::static_pkl_type(*_standard) || + *pkl_type == AtmosAsset::static_pkl_type(*_standard) || + *pkl_type == SMPTESubtitleAsset::static_pkl_type(*_standard) + ) { + + other_assets.push_back (asset_factory(path, ignore_incorrect_picture_mxf_type)); + } else if (*pkl_type == FontAsset::static_pkl_type(*_standard)) { + other_assets.push_back (shared_ptr (new FontAsset (i->first, path))); + } else if (*pkl_type == "image/png") { + /* It's an Interop PNG subtitle; let it go */ + } else { + throw ReadError (String::compose("Unknown asset type %1 in PKL", *pkl_type)); + } } - string pkl_uuid = make_uuid (); - string pkl_path = write_pkl (pkl_uuid, interop, metadata, signer); - - write_volindex (interop); - write_assetmap (pkl_uuid, boost::filesystem::file_size (pkl_path), interop, metadata); + resolve_refs (other_assets); + + /* While we've got the ASSETMAP lets look and see if this DCP refers to things that are not in its ASSETMAP */ + if (notes) { + BOOST_FOREACH (shared_ptr i, cpls()) { + BOOST_FOREACH (shared_ptr j, i->reel_mxfs()) { + if (!j->asset_ref().resolved() && paths.find(j->asset_ref().id()) == paths.end()) { + notes->push_back (VerificationNote(VerificationNote::VERIFY_WARNING, VerificationNote::EXTERNAL_ASSET)); + } + } + } + } } -std::string -DCP::write_pkl (string pkl_uuid, bool interop, XMLMetadata const & metadata, shared_ptr signer) const +void +DCP::resolve_refs (list > assets) { - assert (!_cpls.empty ()); - - boost::filesystem::path p; - p /= _directory; - stringstream s; - s << pkl_uuid << "_pkl.xml"; - p /= s.str(); - - xmlpp::Document doc; - xmlpp::Element* pkl; - if (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"); + BOOST_FOREACH (shared_ptr i, cpls ()) { + i->resolve_refs (assets); } - - if (signer) { - pkl->set_namespace_declaration ("http://www.w3.org/2000/09/xmldsig#", "dsig"); +} + +bool +DCP::equals (DCP const & other, EqualityOptions opt, NoteHandler note) const +{ + list > a = cpls (); + list > 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; } - 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()); - 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 > a = assets (); - for (list >::const_iterator i = a.begin(); i != a.end(); ++i) { - (*i)->write_to_pkl (asset_list, interop); + bool r = true; + + BOOST_FOREACH (shared_ptr i, a) { + list >::const_iterator j = b.begin (); + while (j != b.end() && !(*j)->equals (i, opt, note)) { + ++j; + } + + if (j == b.end ()) { + r = false; + } } - - for (list >::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) { - (*i)->write_to_pkl (asset_list, interop); + + return r; +} + +void +DCP::add (boost::shared_ptr cpl) +{ + _cpls.push_back (cpl); +} + +bool +DCP::encrypted () const +{ + BOOST_FOREACH (shared_ptr i, cpls ()) { + if (i->encrypted ()) { + return true; + } } - if (signer) { - signer->sign (pkl, interop); + return false; +} + +/** Add a KDM to decrypt this DCP. This method must be called after DCP::read() + * or the KDM you specify will be ignored. + * @param kdm KDM to use. + */ +void +DCP::add (DecryptedKDM const & kdm) +{ + list keys = kdm.keys (); + + BOOST_FOREACH (shared_ptr i, cpls ()) { + BOOST_FOREACH (DecryptedKDMKey const & j, kdm.keys ()) { + if (j.cpl_id() == i->id()) { + i->add (kdm); + } + } } - - 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 (bool interop) const +DCP::write_volindex (Standard standard) const { - boost::filesystem::path p; - p /= _directory; - if (interop) { + boost::filesystem::path p = _directory; + switch (standard) { + case INTEROP: p /= "VOLINDEX"; - } else { + break; + case SMPTE: p /= "VOLINDEX.xml"; + break; + default: + DCP_ASSERT (false); } xmlpp::Document doc; xmlpp::Element* root; - if (interop) { - root = doc.create_root_node ("VolumeIndex", "http://www.digicine.com/PROTO-ASDCP-AM-20040311#"); - } else { - root = doc.create_root_node ("VolumeIndex", "http://www.smpte-ra.org/schemas/429-9/2007/AM"); + + switch (standard) { + case INTEROP: + root = doc.create_root_node ("VolumeIndex", volindex_interop_ns); + break; + case SMPTE: + root = doc.create_root_node ("VolumeIndex", volindex_smpte_ns); + break; + default: + DCP_ASSERT (false); } + root->add_child("Index")->add_child_text ("1"); - doc.write_to_file (p.string (), "UTF-8"); + doc.write_to_file_formatted (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, boost::filesystem::path pkl_path, XMLMetadata metadata) const { - boost::filesystem::path p; - p /= _directory; - if (interop) { + boost::filesystem::path p = _directory; + + switch (standard) { + case INTEROP: p /= "ASSETMAP"; - } else { + break; + case SMPTE: p /= "ASSETMAP.xml"; + break; + default: + DCP_ASSERT (false); } xmlpp::Document doc; xmlpp::Element* root; - if (interop) { - root = doc.create_root_node ("AssetMap", "http://www.digicine.com/PROTO-ASDCP-AM-20040311#"); - } else { - root = doc.create_root_node ("AssetMap", "http://www.smpte-ra.org/schemas/429-9/2007/AM"); + + switch (standard) { + case INTEROP: + root = doc.create_root_node ("AssetMap", assetmap_interop_ns); + break; + case SMPTE: + root = doc.create_root_node ("AssetMap", assetmap_smpte_ns); + 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) { + root->add_child("AnnotationText")->add_child_text (metadata.annotation_text); + + 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"); @@ -188,192 +434,101 @@ 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_path.filename().string()); 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 (pkl_length)); - - for (list >::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) { - (*i)->write_to_assetmap (asset_list); - } + chunk->add_child("Length")->add_child_text (raw_convert (boost::filesystem::file_size (pkl_path))); - list > a = assets (); - for (list >::const_iterator i = a.begin(); i != a.end(); ++i) { - (*i)->write_to_assetmap (asset_list); + BOOST_FOREACH (shared_ptr 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"); -} - -void -DCP::read (bool require_mxfs) -{ - read_assets (); - read_cpls (require_mxfs); + doc.write_to_file_formatted (p.string (), "UTF-8"); + _asset_map = p; } +/** 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_assets () -{ - shared_ptr 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, e.number ())); - } - - for (list >::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 (DCPReadError ("no CPL files found")); - } - - if (_files.pkl.empty ()) { - boost::throw_exception (DCPReadError ("no PKL file found")); - } - - shared_ptr pkl; - try { - pkl.reset (new parse::PKL (_files.pkl)); - } catch (FileError& e) { - boost::throw_exception (FileError ("could not load PKL file", _files.pkl, e.number ())); - } - - _asset_maps.push_back (make_pair (boost::filesystem::absolute (_directory).string(), asset_map)); -} - -void -DCP::read_cpls (bool require_mxfs) -{ - for (list::iterator i = _files.cpls.begin(); i != _files.cpls.end(); ++i) { - _cpls.push_back (shared_ptr (new CPL (_directory, *i, _asset_maps, require_mxfs))); - } -} - -bool -DCP::equals (DCP const & other, EqualityOptions opt, boost::function note) const +DCP::write_xml ( + Standard standard, + XMLMetadata metadata, + shared_ptr signer, + NameFormat name_format + ) { - if (_cpls.size() != other._cpls.size()) { - note (ERROR, "CPL counts differ"); - return false; + BOOST_FOREACH (shared_ptr i, cpls ()) { + NameFormat::Map values; + values['t'] = "cpl"; + i->write_xml (_directory / (name_format.get(values, "_" + i->id() + ".xml")), standard, signer); } - list >::const_iterator a = _cpls.begin (); - list >::const_iterator b = other._cpls.begin (); + shared_ptr pkl; - while (a != _cpls.end ()) { - if (!(*a)->equals (*b->get(), opt, note)) { - return false; + if (_pkls.empty()) { + pkl.reset (new PKL (standard, metadata.annotation_text, metadata.issue_date, metadata.issuer, metadata.creator)); + _pkls.push_back (pkl); + BOOST_FOREACH (shared_ptr i, assets ()) { + i->add_to_pkl (pkl, _directory); } - ++a; - ++b; + } else { + pkl = _pkls.front (); } - return true; -} + NameFormat::Map values; + values['t'] = "pkl"; + boost::filesystem::path pkl_path = _directory / name_format.get(values, "_" + pkl->id() + ".xml"); + pkl->write (pkl_path, signer); -void -DCP::add_cpl (shared_ptr cpl) -{ - _cpls.push_back (cpl); + write_volindex (standard); + write_assetmap (standard, pkl->id(), pkl_path, metadata); } -class AssetComparator +list > +DCP::cpls () const { -public: - bool operator() (shared_ptr a, shared_ptr b) { - return a->uuid() < b->uuid(); - } -}; - -list > -DCP::assets () const -{ - list > a; - for (list >::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) { - list > t = (*i)->assets (); - a.merge (t); - } - - a.sort (AssetComparator ()); - a.unique (); - return a; + return _cpls; } -bool -DCP::encrypted () const +/** @param ignore_unresolved true to silently ignore unresolved assets, otherwise + * an exception is thrown if they are found. + * @return All assets (including CPLs). + */ +list > +DCP::assets (bool ignore_unresolved) const { - for (list >::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) { - if ((*i)->encrypted ()) { - return true; + list > assets; + BOOST_FOREACH (shared_ptr i, cpls ()) { + assets.push_back (i); + BOOST_FOREACH (shared_ptr j, i->reel_mxfs()) { + if (ignore_unresolved && !j->asset_ref().resolved()) { + continue; + } + shared_ptr o = j->asset_ref().asset (); + assets.push_back (o); + /* More Interop special-casing */ + shared_ptr sub = dynamic_pointer_cast (o); + if (sub) { + sub->add_font_assets (assets); + } } } - return false; + return assets; } -void -DCP::add_kdm (KDM const & kdm) +/** Given a list of files that make up 1 or more DCPs, return the DCP directories */ +vector +DCP::directories_from_files (vector files) { - list keys = kdm.keys (); - - for (list >::iterator i = _cpls.begin(); i != _cpls.end(); ++i) { - for (list::iterator j = keys.begin(); j != keys.end(); ++j) { - if (j->cpl_id() == (*i)->id()) { - (*i)->add_kdm (kdm); - } + vector d; + BOOST_FOREACH (boost::filesystem::path i, files) { + if (i.filename() == "ASSETMAP" || i.filename() == "ASSETMAP.xml") { + d.push_back (i.parent_path ()); } } -} - -void -DCP::add_assets_from (DCP const & ov) -{ - copy (ov._asset_maps.begin(), ov._asset_maps.end(), back_inserter (_asset_maps)); + return d; }