From d46f9684e7c4a77d07b4bb6f4b8c85dba2584597 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 1 Aug 2016 00:47:53 +0100 Subject: Simplify NameFormat stuff. --- src/dcp.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/dcp.cc') diff --git a/src/dcp.cc b/src/dcp.cc index ba72df8c..6af144dd 100644 --- a/src/dcp.cc +++ b/src/dcp.cc @@ -459,21 +459,21 @@ DCP::write_xml ( Standard standard, XMLMetadata metadata, shared_ptr signer, - FilenameFormat filename_format + NameFormat name_format ) { BOOST_FOREACH (shared_ptr i, cpls ()) { NameFormat::Map values; values['t'] = "cpl"; values['i'] = i->id(); - i->write_xml (_directory / (filename_format.get(values) + ".xml"), standard, signer); + i->write_xml (_directory / (name_format.get(values) + ".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 (filename_format.get(values) + ".xml", standard, pkl_uuid, metadata, signer); + boost::filesystem::path const pkl_path = write_pkl (name_format.get(values) + ".xml", standard, pkl_uuid, metadata, signer); write_volindex (standard); write_assetmap (standard, pkl_uuid, boost::filesystem::file_size (pkl_path), metadata); -- cgit v1.2.3