diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-31 03:14:24 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-31 03:14:24 +0100 |
| commit | 8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8 (patch) | |
| tree | f8b25b13ac3732838be259e469d045438d999e7b /src/lib/shuffler.cc | |
| parent | 4985d87750c87019dfe5dc7ef44e12c45326dd0e (diff) | |
More enum class additions.
Diffstat (limited to 'src/lib/shuffler.cc')
| -rw-r--r-- | src/lib/shuffler.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/shuffler.cc b/src/lib/shuffler.cc index 2b3c5ba84..a13e7f6de 100644 --- a/src/lib/shuffler.cc +++ b/src/lib/shuffler.cc @@ -48,7 +48,7 @@ Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video) { LOG_DEBUG_THREE_D ("Shuffler::video frame=%1 eyes=%2 part=%3", video.frame, static_cast<int>(video.eyes), static_cast<int>(video.part)); - if (video.eyes != EYES_LEFT && video.eyes != EYES_RIGHT) { + if (video.eyes != Eyes::LEFT && video.eyes != Eyes::RIGHT) { /* Pass through anything that we don't care about */ Video (weak_piece, video); return; @@ -57,7 +57,7 @@ Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video) shared_ptr<Piece> piece = weak_piece.lock (); DCPOMATIC_ASSERT (piece); - if (!_last && video.eyes == EYES_LEFT) { + if (!_last && video.eyes == Eyes::LEFT) { LOG_DEBUG_THREE_D_NC ("Shuffler first after clear"); /* We haven't seen anything since the last clear() and we have some eyes-left so assume everything is OK */ Video (weak_piece, video); @@ -74,8 +74,8 @@ Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video) !_store.empty() && _last && ( - (_store.front().second.frame == _last->frame && _store.front().second.eyes == EYES_RIGHT && _last->eyes == EYES_LEFT) || - (_store.front().second.frame >= (_last->frame + 1) && _store.front().second.eyes == EYES_LEFT && _last->eyes == EYES_RIGHT) + (_store.front().second.frame == _last->frame && _store.front().second.eyes == Eyes::RIGHT && _last->eyes == Eyes::LEFT) || + (_store.front().second.frame >= (_last->frame + 1) && _store.front().second.eyes == Eyes::LEFT && _last->eyes == Eyes::RIGHT) ); if (!store_front_in_sequence) { |