diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-08-16 16:24:33 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-08-16 16:24:33 +0100 |
| commit | 03c5a8155043613c01e0e151735a7fcf8ab84415 (patch) | |
| tree | 671045ad4731e1782e92be9109f48da8b5726081 /src/lib/util.cc | |
| parent | 47e78514ffa98c991ddd38d077836f4a558fbec0 (diff) | |
Tidy up a few details with custom filenames.
Diffstat (limited to 'src/lib/util.cc')
| -rw-r--r-- | src/lib/util.cc | 6 |
1 files changed, 2 insertions, 4 deletions
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 |