summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-05-22 00:29:58 +0100
committerCarl Hetherington <cth@carlh.net>2014-05-22 00:29:58 +0100
commite939aa008f49da93ce95c409182657cc083d5987 (patch)
treee8f17b426984932a3bece68e292efe2451ed6e81 /src/lib
parent8fe7bb870d57051d8851b9d1eaa31dfb1e74de68 (diff)
Fix small problem with subtitles and start-trim (I think).
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/player.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index ab0d8f356..4865073d7 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -532,7 +532,7 @@ Player::dcp_to_content_subtitle (shared_ptr<const Piece> piece, DCPTime t) const
s = DCPTime (max (int64_t (0), s.get ()));
s = DCPTime (min (piece->content->length_after_trim().get(), s.get()));
- return ContentTime (s, piece->frc);
+ return ContentTime (s + piece->content->trim_start(), piece->frc);
}
void