From 81ed0ebb725a7b5fec00ae209ba8b0d70ebc4ee1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 16 Aug 2016 16:24:07 +0100 Subject: Always use ID in custom filenames. --- src/dcp.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/dcp.cc') diff --git a/src/dcp.cc b/src/dcp.cc index 8aff6c40..fb0f2625 100644 --- a/src/dcp.cc +++ b/src/dcp.cc @@ -466,15 +466,13 @@ DCP::write_xml ( BOOST_FOREACH (shared_ptr i, cpls ()) { NameFormat::Map values; values['t'] = "cpl"; - values['i'] = i->id(); - i->write_xml (_directory / (name_format.get(values) + ".xml"), standard, signer); + i->write_xml (_directory / (name_format.get(values, "_" + i->id() + ".xml")), standard, signer); } string const pkl_uuid = make_uuid (); NameFormat::Map values; values['t'] = "pkl"; - values['i'] = pkl_uuid; - boost::filesystem::path const pkl_path = write_pkl (name_format.get(values) + ".xml", standard, pkl_uuid, metadata, signer); + boost::filesystem::path const pkl_path = write_pkl (name_format.get(values, "_" + pkl_uuid + ".xml"), standard, pkl_uuid, metadata, signer); write_volindex (standard); write_assetmap (standard, pkl_uuid, pkl_path, metadata); -- cgit v1.2.3