X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=87b10a3989a2021be3e04c0971f14f7e7fe166fa;hb=2d5b8cdde08044d323aa7193dfac6c9f8bca7131;hp=220cf83c0ad6c58814fd96eef768aa32404f182f;hpb=1c0f437ea1cbd6231ef9395b1f07c982cd408c39;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 220cf83c0..87b10a398 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -22,10 +22,8 @@
 #include "film.h"
 #include "ffmpeg_decoder.h"
 #include "ffmpeg_content.h"
-#include "still_image_decoder.h"
-#include "still_image_content.h"
-#include "moving_image_decoder.h"
-#include "moving_image_content.h"
+#include "image_decoder.h"
+#include "image_content.h"
 #include "sndfile_decoder.h"
 #include "sndfile_content.h"
 #include "subtitle_content.h"
@@ -221,16 +219,22 @@ Player::pass ()
 	}
 
 	if (_audio) {
-		Time audio_done_up_to = TIME_MAX;
+		boost::optional<Time> audio_done_up_to;
 		for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
+			if ((*i)->decoder->done ()) {
+				continue;
+			}
+
 			if (dynamic_pointer_cast<AudioDecoder> ((*i)->decoder)) {
-				audio_done_up_to = min (audio_done_up_to, (*i)->audio_position);
+				audio_done_up_to = min (audio_done_up_to.get_value_or (TIME_MAX), (*i)->audio_position);
 			}
 		}
 
-		TimedAudioBuffers<Time> tb = _audio_merger.pull (audio_done_up_to);
-		Audio (tb.audio, tb.time);
-		_audio_position += _film->audio_frames_to_time (tb.audio->frames ());
+		if (audio_done_up_to) {
+			TimedAudioBuffers<Time> tb = _audio_merger.pull (audio_done_up_to.get ());
+			Audio (tb.audio, tb.time);
+			_audio_position += _film->audio_frames_to_time (tb.audio->frames ());
+		}
 	}
 		
 	return false;
@@ -460,36 +464,24 @@ Player::setup_pieces ()
 			piece->decoder = fd;
 		}
 		
-		shared_ptr<const StillImageContent> ic = dynamic_pointer_cast<const StillImageContent> (*i);
+		shared_ptr<const ImageContent> ic = dynamic_pointer_cast<const ImageContent> (*i);
 		if (ic) {
-			shared_ptr<StillImageDecoder> id;
+			bool reusing = false;
 			
-			/* See if we can re-use an old StillImageDecoder */
+			/* See if we can re-use an old ImageDecoder */
 			for (list<shared_ptr<Piece> >::const_iterator j = old_pieces.begin(); j != old_pieces.end(); ++j) {
-				shared_ptr<StillImageDecoder> imd = dynamic_pointer_cast<StillImageDecoder> ((*j)->decoder);
+				shared_ptr<ImageDecoder> imd = dynamic_pointer_cast<ImageDecoder> ((*j)->decoder);
 				if (imd && imd->content() == ic) {
-					id = imd;
+					piece = *j;
+					reusing = true;
 				}
 			}
 
-			if (!id) {
-				id.reset (new StillImageDecoder (_film, ic));
+			if (!reusing) {
+				shared_ptr<ImageDecoder> id (new ImageDecoder (_film, ic));
 				id->Video.connect (bind (&Player::process_video, this, weak_ptr<Piece> (piece), _1, _2, _3, _4, 0));
+				piece->decoder = id;
 			}
-
-			piece->decoder = id;
-		}
-
-		shared_ptr<const MovingImageContent> mc = dynamic_pointer_cast<const MovingImageContent> (*i);
-		if (mc) {
-			shared_ptr<MovingImageDecoder> md;
-
-			if (!md) {
-				md.reset (new MovingImageDecoder (_film, mc));
-				md->Video.connect (bind (&Player::process_video, this, weak_ptr<Piece> (piece), _1, _2, _3, _4, 0));
-			}
-
-			piece->decoder = md;
 		}
 
 		shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (*i);