Allow configuration of MXF/XML filenames (part of #710).

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

diff --git a/src/lib/util.cc b/src/lib/util.cc
index c8d0561bec1e19600b4b2535db98d8e27010edd2..a0d6453ff76af2f5d2a44e3a924ebf5092cabfad 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -617,24 +617,30 @@ split_get_request (string url)
 }
 
 string
-video_asset_filename (shared_ptr<dcp::PictureAsset> asset, int reel_index, int reel_count)
+video_asset_filename (shared_ptr<dcp::PictureAsset> asset, int reel_index, int reel_count, optional<string> summary)
 {
        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_filename_format().get(values) + ".mxf";
 }
 
 string
-audio_asset_filename (shared_ptr<dcp::SoundAsset> asset, int reel_index, int reel_count)
+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['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_filename_format().get(values) + ".mxf";
 }