X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=30313d39dd23bb57445cf43ff8a45f7b9c2d8b00;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hp=d437d5b1bf964e99cc3c3130b0035c26a95907ca;hpb=b0f078d851e2a84d2f9d2ae085f6aad837747eb1;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index d437d5b1b..30313d39d 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -115,14 +115,6 @@ Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist
 void
 Player::setup_pieces ()
 {
-	list<shared_ptr<ImageDecoder> > old_image_decoders;
-	BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
-		shared_ptr<ImageDecoder> imd = dynamic_pointer_cast<ImageDecoder> (i->decoder);
-		if (imd) {
-			old_image_decoders.push_back (imd);
-		}
-	}
-
 	_pieces.clear ();
 
 	BOOST_FOREACH (shared_ptr<Content> i, _playlist->content ()) {
@@ -131,7 +123,7 @@ Player::setup_pieces ()
 			continue;
 		}
 
-		shared_ptr<Decoder> decoder = decoder_factory (i, old_image_decoders, _film->log(), _fast);
+		shared_ptr<Decoder> decoder = decoder_factory (i, _film->log(), _fast);
 		FrameRateChange frc (i->active_video_frame_rate(), _film->video_frame_rate());
 
 		if (!decoder) {
@@ -382,12 +374,12 @@ Player::get_video (DCPTime time, bool accurate)
 							shared_ptr<PlayerVideo> (
 								new PlayerVideo (
 									i->image,
-									content_video_to_dcp (piece, i->frame),
+									time,
 									piece->content->video->crop (),
-									piece->content->video->fade (i->frame),
+									piece->content->video->fade (i->frame.index()),
 									image_size,
 									_video_container_size,
-									i->eyes,
+									i->frame.eyes(),
 									i->part,
 									piece->content->video->colour_conversion ()
 									)