From 12f089b89fff8409cd012cab1ba4eb8b619e554e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 3 Jun 2022 19:56:40 +0200
Subject: [PATCH] Tidy up some duplicated code.

---
 src/lib/util.cc | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 133795e1b..e1eb7323c 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -705,44 +705,40 @@ split_get_request (string url)
 	return r;
 }
 
+
+static
 string
-video_asset_filename (shared_ptr<dcp::PictureAsset> asset, int reel_index, int reel_count, optional<string> summary)
+asset_filename (shared_ptr<dcp::Asset> asset, string type, int reel_index, int reel_count, optional<string> summary)
 {
 	dcp::NameFormat::Map values;
-	values['t'] = "j2c";
-	values['r'] = raw_convert<string> (reel_index + 1);
-	values['n'] = raw_convert<string> (reel_count);
+	values['t'] = type;
+	values['r'] = raw_convert<string>(reel_index + 1);
+	values['n'] = raw_convert<string>(reel_count);
 	if (summary) {
-		values['c'] = careful_string_filter (summary.get());
+		values['c'] = careful_string_filter(summary.get());
 	}
 	return Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + ".mxf");
 }
 
+
+string
+video_asset_filename (shared_ptr<dcp::PictureAsset> asset, int reel_index, int reel_count, optional<string> summary)
+{
+	return asset_filename(asset, "j2c", reel_index, reel_count, summary);
+}
+
+
 string
 audio_asset_filename (shared_ptr<dcp::SoundAsset> asset, int reel_index, int reel_count, optional<string> summary)
 {
-	dcp::NameFormat::Map values;
-	values['t'] = "pcm";
-	values['r'] = raw_convert<string> (reel_index + 1);
-	values['n'] = raw_convert<string> (reel_count);
-	if (summary) {
-		values['c'] = careful_string_filter (summary.get());
-	}
-	return Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + ".mxf");
+	return asset_filename(asset, "pcm", reel_index, reel_count, summary);
 }
 
 
 string
 atmos_asset_filename (shared_ptr<dcp::AtmosAsset> asset, int reel_index, int reel_count, optional<string> summary)
 {
-	dcp::NameFormat::Map values;
-	values['t'] = "atmos";
-	values['r'] = raw_convert<string> (reel_index + 1);
-	values['n'] = raw_convert<string> (reel_count);
-	if (summary) {
-		values['c'] = careful_string_filter (summary.get());
-	}
-	return Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + ".mxf");
+	return asset_filename(asset, "atmos", reel_index, reel_count, summary);
 }
 
 
-- 
2.30.2