X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fshuffler.cc;h=2b3c5ba84c4c72da4a1687b3ec60201dece1c95c;hp=0e478a562a658a6e6fe48493772ddb1eced6ee1f;hb=4985d87750c87019dfe5dc7ef44e12c45326dd0e;hpb=1d2a51bdc8315fa7283be329669860e435a1513f

diff --git a/src/lib/shuffler.cc b/src/lib/shuffler.cc
index 0e478a562..2b3c5ba84 100644
--- a/src/lib/shuffler.cc
+++ b/src/lib/shuffler.cc
@@ -46,7 +46,7 @@ struct Comparator
 void
 Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video)
 {
-	LOG_DEBUG_THREED ("Shuffler::video frame=%1 eyes=%2 part=%3", video.frame, static_cast<int>(video.eyes), static_cast<int>(video.part));
+	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) {
 		/* Pass through anything that we don't care about */
@@ -58,7 +58,7 @@ Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video)
 	DCPOMATIC_ASSERT (piece);
 
 	if (!_last && video.eyes == EYES_LEFT) {
-		LOG_DEBUG_THREED_NC ("Shuffler first after clear");
+		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);
 		_last = video;
@@ -81,7 +81,7 @@ Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video)
 		if (!store_front_in_sequence) {
 			string const store = _store.empty() ? "store empty" : String::compose("store front frame=%1 eyes=%2", _store.front().second.frame, static_cast<int>(_store.front().second.eyes));
 			string const last = _last ? String::compose("last frame=%1 eyes=%2", _last->frame, static_cast<int>(_last->eyes)) : "no last";
-			LOG_DEBUG_THREED("Shuffler not in sequence: %1 %2", store, last);
+			LOG_DEBUG_THREE_D("Shuffler not in sequence: %1 %2", store, last);
 		}
 
 		if (!store_front_in_sequence && _store.size() <= _max_size) {
@@ -96,7 +96,7 @@ Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video)
 			LOG_WARNING ("Shuffler is full after receiving frame %1; 3D sync may be incorrect.", video.frame);
 		}
 
-		LOG_DEBUG_THREED("Shuffler emits frame=%1 eyes=%2 store=%3", _store.front().second.frame, static_cast<int>(_store.front().second.eyes), _store.size());
+		LOG_DEBUG_THREE_D("Shuffler emits frame=%1 eyes=%2 store=%3", _store.front().second.frame, static_cast<int>(_store.front().second.eyes), _store.size());
 		Video (_store.front().first, _store.front().second);
 		_last = _store.front().second;
 		_store.pop_front ();
@@ -106,7 +106,7 @@ Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video)
 void
 Shuffler::clear ()
 {
-	LOG_DEBUG_THREED_NC ("Shuffler::clear");
+	LOG_DEBUG_THREE_D_NC ("Shuffler::clear");
 	_store.clear ();
 	_last = optional<ContentVideo>();
 }