summaryrefslogtreecommitdiff
path: root/src/lib/player.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-09-15 01:00:33 +0200
committerCarl Hetherington <cth@carlh.net>2021-09-27 13:41:46 +0200
commit9bfa07293928c371d59db2091ba2b7e715ce5994 (patch)
treef73bc4c69e13d19c934b0ee798ebfa4a68e46597 /src/lib/player.cc
parentc59981ce92898f6be6987f10ebb29161e36e6766 (diff)
Various alignment adjustments.
Diffstat (limited to 'src/lib/player.cc')
-rw-r--r--src/lib/player.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 5de089ba9..810d949d9 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -95,11 +95,12 @@ int const PlayerProperty::DCP_DECODE_REDUCTION = 704;
int const PlayerProperty::PLAYBACK_LENGTH = 705;
-Player::Player (shared_ptr<const Film> film)
+Player::Player (shared_ptr<const Film> film, bool aligned)
: _film (film)
, _suspended (0)
, _tolerant (film->tolerant())
, _audio_merger (_film->audio_frame_rate())
+ , _aligned_subtitles (aligned)
{
construct ();
}
@@ -827,7 +828,7 @@ Player::open_subtitles_for_frame (DCPTime time) const
return {};
}
- return merge (captions);
+ return merge (captions, _aligned_subtitles);
}