summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-11-02 14:11:54 +0100
committerCarl Hetherington <cth@carlh.net>2021-11-02 14:56:37 +0100
commit7eed4fb3d35f0fb53bf877bfa5ddbefe4b2d20ed (patch)
tree16c163f5175bee7699687df09cd3d0f79edc5837
parentbe075849acc0858b7e30ea86991f8767c0be83b2 (diff)
Cleanup variable name: a -> reel_assets
-rw-r--r--src/lib/player.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index dcc89bab9..0782df9da 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -557,7 +557,7 @@ Player::get_reel_assets ()
{
/* Does not require a lock on _mutex as it's only called from DCPEncoder */
- list<ReferencedReelAsset> a;
+ list<ReferencedReelAsset> reel_assets;
for (auto i: playlist()->content()) {
auto j = dynamic_pointer_cast<DCPContent> (i);
@@ -569,7 +569,7 @@ Player::get_reel_assets ()
try {
decoder.reset (new DCPDecoder(_film, j, false, false, shared_ptr<DCPDecoder>()));
} catch (...) {
- return a;
+ return reel_assets;
}
DCPOMATIC_ASSERT (j->video_frame_rate ());
@@ -598,20 +598,20 @@ Player::get_reel_assets ()
auto const from = i->position() + DCPTime::from_frames (offset_from_start, _film->video_frame_rate());
if (j->reference_video ()) {
- maybe_add_asset (a, k->main_picture(), reel_trim_start, reel_trim_end, from, ffr);
+ maybe_add_asset (reel_assets, k->main_picture(), reel_trim_start, reel_trim_end, from, ffr);
}
if (j->reference_audio ()) {
- maybe_add_asset (a, k->main_sound(), reel_trim_start, reel_trim_end, from, ffr);
+ maybe_add_asset (reel_assets, k->main_sound(), reel_trim_start, reel_trim_end, from, ffr);
}
if (j->reference_text (TextType::OPEN_SUBTITLE)) {
- maybe_add_asset (a, k->main_subtitle(), reel_trim_start, reel_trim_end, from, ffr);
+ maybe_add_asset (reel_assets, k->main_subtitle(), reel_trim_start, reel_trim_end, from, ffr);
}
if (j->reference_text (TextType::CLOSED_CAPTION)) {
for (auto l: k->closed_captions()) {
- maybe_add_asset (a, l, reel_trim_start, reel_trim_end, from, ffr);
+ maybe_add_asset (reel_assets, l, reel_trim_start, reel_trim_end, from, ffr);
}
}
@@ -620,7 +620,7 @@ Player::get_reel_assets ()
}
}
- return a;
+ return reel_assets;
}