From 6d5c9b454e586ca53c9d59d93fc4b721d6dbf68f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 25 May 2015 00:09:58 +0100 Subject: Rename CPL/PKL files to be {cpl,pkl}_uuid.xml rather than uuid_{cpl,pkl}.xml as this seems to be more conventional. --- src/dcp.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/dcp.cc b/src/dcp.cc index f98fa1d3..638ed707 100644 --- a/src/dcp.cc +++ b/src/dcp.cc @@ -235,7 +235,7 @@ boost::filesystem::path DCP::write_pkl (Standard standard, string pkl_uuid, XMLMetadata metadata, shared_ptr signer) const { boost::filesystem::path p = _directory; - p /= String::compose ("%1_pkl.xml", pkl_uuid); + p /= String::compose ("pkl_%1.xml", pkl_uuid); xmlpp::Document doc; xmlpp::Element* pkl; @@ -365,7 +365,7 @@ DCP::write_assetmap (Standard standard, string pkl_uuid, int pkl_length, XMLMeta 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 (raw_convert (pkl_length)); @@ -391,7 +391,7 @@ DCP::write_xml ( ) { BOOST_FOREACH (shared_ptr i, cpls ()) { - string const filename = i->id() + "_cpl.xml"; + string const filename = "cpl_" + i->id() + ".xml"; i->write_xml (_directory / filename, standard, signer); } -- cgit v1.2.3