projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cacb075
)
Tidy up some duplicated code.
author
Carl Hetherington
<cth@carlh.net>
Fri, 3 Jun 2022 17:56:40 +0000
(19:56 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 3 Jun 2022 20:40:59 +0000
(22:40 +0200)
src/lib/util.cc
patch
|
blob
|
history
diff --git
a/src/lib/util.cc
b/src/lib/util.cc
index 133795e1b907b265e728dc3b4bddc6799c3e4e5c..e1eb7323c4363e1ec5aa601c8961172bca4f26be 100644
(file)
--- a/
src/lib/util.cc
+++ b/
src/lib/util.cc
@@
-705,44
+705,40
@@
split_get_request (string url)
return r;
}
return r;
}
+
+static
string
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;
{
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) {
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");
}
}
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)
{
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)
{
}
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);
}
}