summaryrefslogtreecommitdiff
path: root/src/lib/playlist.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-06-28 10:09:53 +0100
committerCarl Hetherington <cth@carlh.net>2017-06-29 11:26:13 +0100
commitbaf84885a777378b9ff5c05ef24d6361560822a6 (patch)
tree18b953a0e1a6b05609f98193a766a679de434551 /src/lib/playlist.cc
parent4fbe44913582d6cc48a7d61145f3170fb0eec595 (diff)
Fixes for silence in projects, various cleanups.
Diffstat (limited to 'src/lib/playlist.cc')
-rw-r--r--src/lib/playlist.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 3609f9eb3..12832cfd7 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -563,11 +563,7 @@ Playlist::audio_content_at (DCPTime time) const
if (!i->audio) {
continue;
}
- DCPTime end = i->end ();
- if (i->audio->delay() < 0) {
- end += DCPTime::from_seconds (i->audio->delay() / 1000.0);
- }
- if (i->position() <= time && time < end) {
+ if (i->position() <= time && time < i->end()) {
return true;
}
}