projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
77cfe09
)
Use FrameRateChange from the Piece rather than making a new one.
author
Carl Hetherington
<cth@carlh.net>
Mon, 22 Jun 2020 22:03:41 +0000
(
00:03
+0200)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 22 Jun 2020 22:03:41 +0000
(
00:03
+0200)
src/lib/player.cc
patch
|
blob
|
history
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index 898298d4ef1ef6a602729f7cbdbcba37a6d97175..62b90045937d997108556834c79fc5dfc5780b21 100644
(file)
--- a/
src/lib/player.cc
+++ b/
src/lib/player.cc
@@
-762,8
+762,7
@@
Player::video (weak_ptr<Piece> wp, ContentVideo video)
return;
}
- FrameRateChange frc (_film, piece->content);
- if (frc.skip && (video.frame % 2) == 1) {
+ if (piece->frc.skip && (video.frame % 2) == 1) {
return;
}
@@
-848,7
+847,7
@@
Player::video (weak_ptr<Piece> wp, ContentVideo video)
);
DCPTime t = time;
- for (int i = 0; i < frc.repeat; ++i) {
+ for (int i = 0; i <
piece->
frc.repeat; ++i) {
if (t < piece->end(_film)) {
emit_video (_last_video[wp], t);
}