projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix enabled/disable overlapping video/audio with DCP content (part of #1355)
[dcpomatic.git]
/
src
/
lib
/
player.cc
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index d2e5ed52104b136b136b5c578f08d745ab12c4a9..fc821d6c70e55f10a697fb23861e0fcffff9ff2b 100644
(file)
--- a/
src/lib/player.cc
+++ b/
src/lib/player.cc
@@
-795,6
+795,10
@@
Player::video (weak_ptr<Piece> wp, ContentVideo video)
return;
}
+ if (!piece->content->video->use()) {
+ return;
+ }
+
FrameRateChange frc (_film, piece->content);
if (frc.skip && (video.frame % 2) == 1) {
return;