X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=53b1733330764aa5b76b988f58b096da6a331f62;hp=619a3583cbb770e6c5d6f3f2329e4aa0d6e4f43d;hb=d2e40a18eee940f1333c7e63d423b1d56e50c5e6;hpb=a1d11f2e9cc3678bd68b95c0e444c8245ef776b5

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 619a3583c..53b173333 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -166,8 +166,19 @@ Player::setup_pieces_unlocked ()
 	auto old_pieces = _pieces;
 	_pieces.clear ();
 
-	_shuffler.reset (new Shuffler());
-	_shuffler->Video.connect(bind(&Player::video, this, _1, _2));
+	auto playlist_content = playlist()->content();
+	bool const have_threed = std::any_of(
+		playlist_content.begin(),
+		playlist_content.end(),
+		[](shared_ptr<const Content> c) {
+			return c->video && (c->video->frame_type() == VideoFrameType::THREE_D_LEFT || c->video->frame_type() == VideoFrameType::THREE_D_RIGHT);
+		});
+
+
+	if (have_threed) {
+		_shuffler.reset(new Shuffler());
+		_shuffler->Video.connect(bind(&Player::video, this, _1, _2));
+	}
 
 	for (auto i: playlist()->content()) {
 
@@ -219,7 +230,7 @@ Player::setup_pieces_unlocked ()
 		_pieces.push_back (piece);
 
 		if (decoder->video) {
-			if (i->video->frame_type() == VideoFrameType::THREE_D_LEFT || i->video->frame_type() == VideoFrameType::THREE_D_RIGHT) {
+			if (have_threed) {
 				/* We need a Shuffler to cope with 3D L/R video data arriving out of sequence */
 				decoder->video->Data.connect (bind(&Shuffler::video, _shuffler.get(), weak_ptr<Piece>(piece), _1));
 			} else {
@@ -810,7 +821,9 @@ Player::pass ()
 	}
 
 	if (done) {
-		_shuffler->flush ();
+		if (_shuffler) {
+			_shuffler->flush ();
+		}
 		for (auto const& i: _delay) {
 			do_emit_video(i.first, i.second);
 		}
@@ -1432,6 +1445,22 @@ Player::content_time_to_dcp (shared_ptr<const Content> content, ContentTime t)
 }
 
 
+optional<ContentTime>
+Player::dcp_to_content_time (shared_ptr<const Content> content, DCPTime t)
+{
+	boost::mutex::scoped_lock lm (_mutex);
+
+	for (auto i: _pieces) {
+		if (i->content == content) {
+			return dcp_to_content_time (i, t);
+		}
+	}
+
+	/* We couldn't find this content; perhaps things are being changed over */
+	return {};
+}
+
+
 shared_ptr<const Playlist>
 Player::playlist () const
 {