From: Carl Hetherington <cth@carlh.net>
Date: Sun, 15 May 2022 20:15:05 +0000 (+0200)
Subject: Improve the clarity of some log messages.
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=0ea7ba49351ffd5f944c000ba581a1fcd032efb7;p=dcpomatic.git

Improve the clarity of some log messages.
---

diff --git a/src/lib/player.cc b/src/lib/player.cc
index f3d78ab32..94bb80779 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -916,7 +916,11 @@ Player::video (weak_ptr<Piece> weak_piece, ContentVideo video)
 
 	/* Time of the first frame we will emit */
 	DCPTime const time = content_video_to_dcp (piece, video.frame);
-	LOG_DEBUG_PLAYER("Received video frame %1 at %2", video.frame, to_string(time));
+	if (video.eyes == Eyes::BOTH) {
+		LOG_DEBUG_PLAYER("Received video frame %1 at %2", video.frame, to_string(time));
+	} else {
+		LOG_DEBUG_PLAYER("Received video frame %1 %2 at %3", (video.eyes == Eyes::LEFT ? "L" : "R"), video.frame, to_string(time));
+	}
 
 	/* Discard if it's before the content's period or the last accurate seek.  We can't discard
 	   if it's after the content's period here as in that case we still need to fill any gap between
diff --git a/src/lib/shuffler.cc b/src/lib/shuffler.cc
index 5a4faf4d1..b02514a8e 100644
--- a/src/lib/shuffler.cc
+++ b/src/lib/shuffler.cc
@@ -83,8 +83,8 @@ Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video)
 				(_store.front().second.frame >= (_last->frame + 1) && _store.front().second.eyes == Eyes::LEFT  && _last->eyes == Eyes::RIGHT)
 				);
 
-		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));
+		if (!store_front_in_sequence && !_store.empty()) {
+			string const store = 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_THREE_D("Shuffler not in sequence: %1 %2", store, last);
 		}