From a6aaf223e085e9ef7f2bc1cc37614ecb13d323ec Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 18 May 2015 10:50:14 +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/cpl.cc | 4 ++-- src/dcp.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/cpl.cc b/src/cpl.cc index 6fc52be5..67376377 100644 --- a/src/cpl.cc +++ b/src/cpl.cc @@ -195,7 +195,7 @@ CPL::add_reel (shared_ptr reel) boost::filesystem::path CPL::filename () const { - return _directory / String::compose ("%1_cpl.xml", _id); + return _directory / String::compose ("cpl_%1.xml", _id); } void @@ -286,7 +286,7 @@ CPL::write_to_assetmap (xmlpp::Node* node) const asset->add_child("Id")->add_child_text ("urn:uuid:" + _id); xmlpp::Node* chunk_list = asset->add_child ("ChunkList"); xmlpp::Node* chunk = chunk_list->add_child ("Chunk"); - chunk->add_child("Path")->add_child_text (_id + "_cpl.xml"); + chunk->add_child("Path")->add_child_text ("cpl_" + _id + ".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 (_length)); diff --git a/src/dcp.cc b/src/dcp.cc index 7cce30fe..87a9565b 100644 --- a/src/dcp.cc +++ b/src/dcp.cc @@ -84,7 +84,7 @@ DCP::write_pkl (string pkl_uuid, bool interop, XMLMetadata const & metadata, sha boost::filesystem::path p; p /= _directory; stringstream s; - s << pkl_uuid << "_pkl.xml"; + s << "pkl_" << pkl_uuid << ".xml"; p /= s.str(); xmlpp::Document doc; @@ -186,7 +186,7 @@ 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 (raw_convert (pkl_length)); -- cgit v1.2.3