Basics of custom DCP filename components.

[dcpomatic.git] / src / lib / util.cc

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 4a0965858eabbf07aa0c156f5714eeb50d2f7ec7..09f32dfda5d4b541fe5c4874a041fc47aeb6f3bf 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -619,13 +619,19 @@ split_get_request (string url)
 string
 video_asset_filename (shared_ptr<dcp::PictureAsset> asset)
 {
-       return "j2c_" + asset->id() + ".mxf";
+       dcp::NameFormat::Map values;
+       values["type"] = "j2c";
+       values["id"] = asset->id();
+       return Config::instance()->dcp_filename_format().get(values) + ".mxf";
 }
 
 string
 audio_asset_filename (shared_ptr<dcp::SoundAsset> asset)
 {
-       return "pcm_" + asset->id() + ".mxf";
+       dcp::NameFormat::Map values;
+       values["type"] = "pcm";
+       values["id"] = asset->id();
+       return Config::instance()->dcp_filename_format().get(values) + ".mxf";
 }
 
 float