diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-06-07 12:36:40 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-06-07 12:36:40 +0200 |
| commit | 6a3c03c5eed3cab8fdfdb04fcbaf6cabe8c715e9 (patch) | |
| tree | 8b5a7a47aff2a066f304c6bd31c2780c6f92ca98 /src/lib/util.cc | |
| parent | fcba100f0dfd1d4214291abb76f22ebd696c24d4 (diff) | |
Fix incorrect extension on interop subtitle files (#2270).
Diffstat (limited to 'src/lib/util.cc')
| -rw-r--r-- | src/lib/util.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/util.cc b/src/lib/util.cc index 2c38257b4..79730d347 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -708,7 +708,7 @@ split_get_request (string url) static string -asset_filename (shared_ptr<dcp::Asset> asset, string type, 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, string extension) { dcp::NameFormat::Map values; values['t'] = type; @@ -717,35 +717,35 @@ asset_filename (shared_ptr<dcp::Asset> asset, string type, int reel_index, int r if (summary) { values['c'] = careful_string_filter(summary.get()); } - return Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + ".mxf"); + return Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + extension); } 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); + return asset_filename(asset, "j2c", reel_index, reel_count, summary, ".mxf"); } string audio_asset_filename (shared_ptr<dcp::SoundAsset> asset, int reel_index, int reel_count, optional<string> summary) { - return asset_filename(asset, "pcm", reel_index, reel_count, summary); + return asset_filename(asset, "pcm", reel_index, reel_count, summary, ".mxf"); } string -subtitle_asset_filename (shared_ptr<dcp::SubtitleAsset> asset, int reel_index, int reel_count, optional<string> summary) +subtitle_asset_filename (shared_ptr<dcp::SubtitleAsset> asset, int reel_index, int reel_count, optional<string> summary, string extension) { - return asset_filename(asset, "sub", reel_index, reel_count, summary); + return asset_filename(asset, "sub", reel_index, reel_count, summary, extension); } string atmos_asset_filename (shared_ptr<dcp::AtmosAsset> asset, int reel_index, int reel_count, optional<string> summary) { - return asset_filename(asset, "atmos", reel_index, reel_count, summary); + return asset_filename(asset, "atmos", reel_index, reel_count, summary, ".mxf"); } |