projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
24ba224
)
Fix thinko in previous.
author
Carl Hetherington
<cth@carlh.net>
Fri, 23 Feb 2018 01:21:12 +0000
(
01:21
+0000)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 23 Feb 2018 01:21:22 +0000
(
01:21
+0000)
src/lib/player.cc
patch
|
blob
|
history
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index 87a294042cb05f6a5f3680b736fd7a16804ff4c0..6b858ed2c50573a7640b77a876f41343aa0d69e4 100644
(file)
--- a/
src/lib/player.cc
+++ b/
src/lib/player.cc
@@
-983,7
+983,14
@@
Player::emit_video (shared_ptr<PlayerVideo> pv, DCPTime time)
player before the video that requires them.
*/
_delay.push_back (make_pair (pv, time));
player before the video that requires them.
*/
_delay.push_back (make_pair (pv, time));
- if (_delay.size() < 2) {
+
+ if (pv->eyes() == EYES_BOTH || pv->eyes() == EYES_RIGHT) {
+ _last_video_time = time + one_video_frame();
+ _active_subtitles.clear_before (time);
+ }
+ _last_video_eyes = increment_eyes (pv->eyes());
+
+ if (_delay.size() < 3) {
return;
}
return;
}
@@
-1001,12
+1008,6
@@
Player::do_emit_video (shared_ptr<PlayerVideo> pv, DCPTime time)
}
Video (pv, time);
}
Video (pv, time);
-
- if (pv->eyes() == EYES_BOTH || pv->eyes() == EYES_RIGHT) {
- _last_video_time = time + one_video_frame();
- _active_subtitles.clear_before (time);
- }
- _last_video_eyes = increment_eyes (pv->eyes());
}
void
}
void