From: Carl Hetherington <cth@carlh.net>
Date: Sun, 5 Mar 2023 13:07:01 +0000 (+0100)
Subject: Remove some 3D stuff I think is unnecessary since the changes in 2f12058c535045cecc22... 
X-Git-Tag: v2.16.46
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=a31cfda11a8e3260cdf267be056cb9b4f4b158dd

Remove some 3D stuff I think is unnecessary since the changes in 2f12058c535045cecc226fe47b3d60da8851a862
---

diff --git a/src/lib/player.cc b/src/lib/player.cc
index abcefcab5..610d7748d 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -1422,16 +1422,6 @@ Player::emit_video (shared_ptr<PlayerVideo> pv, DCPTime time)
 	auto film = _film.lock();
 	DCPOMATIC_ASSERT(film);
 
-	if (!film->three_d()) {
-		if (pv->eyes() == Eyes::LEFT) {
-			/* Use left-eye images for both eyes... */
-			pv->set_eyes (Eyes::BOTH);
-		} else if (pv->eyes() == Eyes::RIGHT) {
-			/* ...and discard the right */
-			return;
-		}
-	}
-
 	/* We need a delay to give a little wiggle room to ensure that relevant subtitles arrive at the
 	   player before the video that requires them.
 	*/
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 1c8f1a0cd..2a2925cf0 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -231,17 +231,12 @@ Writer::fake_write (Frame frame, Eyes eyes)
 		qi.size = _reels[reel].read_frame_info(info_file, frame_in_reel, eyes).size;
 	}
 
+	DCPOMATIC_ASSERT((film()->three_d() && eyes != Eyes::BOTH) || (!film()->three_d() && eyes == Eyes::BOTH));
+
 	qi.reel = reel;
 	qi.frame = frame_in_reel;
-	if (film()->three_d() && eyes == Eyes::BOTH) {
-		qi.eyes = Eyes::LEFT;
-		_queue.push_back (qi);
-		qi.eyes = Eyes::RIGHT;
-		_queue.push_back (qi);
-	} else {
-		qi.eyes = eyes;
-		_queue.push_back (qi);
-	}
+	qi.eyes = eyes;
+	_queue.push_back(qi);
 
 	/* Now there's something to do: wake anything wait()ing on _empty_condition */
 	_empty_condition.notify_all ();