Tidy up a few details with custom filenames.

4 files changed, 8 insertions, 10 deletions

diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc
index c05dd6138..6a0349b31 100644
--- a/src/lib/cinema_kdms.cc
+++ b/src/lib/cinema_kdms.cc
@@ -64,7 +64,7 @@ CinemaKDMs::make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat nam
 		}
 
 		name_values['s'] = i.screen->name;
-		string const name = name_format.get(name_values) + ".xml";
+		string const name = name_format.get(name_values, ".xml");
 		if (zip_add (zip, name.c_str(), source) == -1) {
 			throw runtime_error ("failed to add KDM to ZIP archive");
 		}
@@ -128,7 +128,7 @@ CinemaKDMs::write_zip_files (
 	BOOST_FOREACH (CinemaKDMs const & i, cinema_kdms) {
 		boost::filesystem::path path = directory;
 		name_values['c'] = i.cinema->name;
-		path /= name_format.get(name_values) + ".zip";
+		path /= name_format.get(name_values, ".zip");
 		i.make_zip_file (path, name_format, name_values);
 	}
 }
@@ -189,7 +189,7 @@ CinemaKDMs::email (
 			email.add_bcc (config->kdm_bcc ());
 		}
 
-		email.add_attachment (zip_file, name_format.get(name_values) + ".zip", "application/zip");
+		email.add_attachment (zip_file, name_format.get(name_values, ".zip"), "application/zip");
 
 		Config* c = Config::instance ();
 
diff --git a/src/lib/config.cc b/src/lib/config.cc
index b5e4b4d00..5df45ea08 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -111,8 +111,8 @@ Config::set_defaults ()
 	_cinemas_file = path ("cinemas.xml");
 	_show_hints_before_make_dcp = true;
 	_kdm_filename_format = dcp::NameFormat ("KDM %f %c %s");
-	_dcp_metadata_filename_format = dcp::NameFormat ("%t_%i");
-	_dcp_asset_filename_format = dcp::NameFormat ("%t_%i");
+	_dcp_metadata_filename_format = dcp::NameFormat ("%t");
+	_dcp_asset_filename_format = dcp::NameFormat ("%t");
 
 	_allowed_dcp_frame_rates.clear ();
 	_allowed_dcp_frame_rates.push_back (24);
diff --git a/src/lib/screen_kdm.cc b/src/lib/screen_kdm.cc
index 129e64aee..182d03bb0 100644
--- a/src/lib/screen_kdm.cc
+++ b/src/lib/screen_kdm.cc
@@ -41,7 +41,7 @@ ScreenKDM::write_files (list<ScreenKDM> screen_kdms, boost::filesystem::path dir
 	BOOST_FOREACH (ScreenKDM const & i, screen_kdms) {
 		name_values['c'] = i.screen->cinema->name;
 		name_values['s'] = i.screen->name;
-		boost::filesystem::path out = directory / (name_format.get(name_values) + ".xml");
+		boost::filesystem::path out = directory / (name_format.get(name_values, ".xml"));
 		i.kdm.as_xml (out);
 	}
 }
diff --git a/src/lib/util.cc b/src/lib/util.cc
index d20fd7dc7..704d4aa9d 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -619,13 +619,12 @@ video_asset_filename (shared_ptr<dcp::PictureAsset> asset, int reel_index, int r
 {
 	dcp::NameFormat::Map values;
 	values['t'] = "j2c";
-	values['i'] = asset->id();
 	values['r'] = raw_convert<string> (reel_index + 1);
 	values['n'] = raw_convert<string> (reel_count);
 	if (summary) {
 		values['c'] = summary.get();
 	}
-	return Config::instance()->dcp_asset_filename_format().get(values) + ".mxf";
+	return Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + ".mxf");
 }
 
 string
@@ -633,13 +632,12 @@ audio_asset_filename (shared_ptr<dcp::SoundAsset> asset, int reel_index, int ree
 {
 	dcp::NameFormat::Map values;
 	values['t'] = "pcm";
-	values['i'] = asset->id();
 	values['r'] = raw_convert<string> (reel_index + 1);
 	values['n'] = raw_convert<string> (reel_count);
 	if (summary) {
 		values['c'] = summary.get();
 	}
-	return Config::instance()->dcp_asset_filename_format().get(values) + ".mxf";
+	return Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + ".mxf");
 }
 
 float