projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
aefd6c8
)
Fix mistaken use of wrong enum.
author
Carl Hetherington
<cth@carlh.net>
Tue, 14 Jul 2015 09:12:07 +0000
(10:12 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 14 Jul 2015 09:12:07 +0000
(10:12 +0100)
src/lib/player.cc
patch
|
blob
|
history
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index b0ba415979a7ba61e8ab55499ee06d49a5871f1a..ed4519acafa7ddbffdfd85c9b4f6c8a1570ff640 100644
(file)
--- a/
src/lib/player.cc
+++ b/
src/lib/player.cc
@@
-374,8
+374,8
@@
Player::get_video (DCPTime time, bool accurate)
shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> ((*i)->content);
/* Use the second to last if it's the other part of a 3D content pair */
if (
shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> ((*i)->content);
/* Use the second to last if it's the other part of a 3D content pair */
if (
- (first_type ==
EYES_LEFT && vc->video_frame_type() == EYES
_RIGHT) ||
- (first_type ==
EYES_RIGHT && vc->video_frame_type() == EYES
_LEFT)
+ (first_type ==
VIDEO_FRAME_TYPE_3D_LEFT && vc->video_frame_type() == VIDEO_FRAME_TYPE_3D
_RIGHT) ||
+ (first_type ==
VIDEO_FRAME_TYPE_3D_RIGHT && vc->video_frame_type() == VIDEO_FRAME_TYPE_3D
_LEFT)
) {
/* Other part of a pair of 3D content */
ov_to_use.push_back (*i);
) {
/* Other part of a pair of 3D content */
ov_to_use.push_back (*i);