X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder_factory.cc;h=b2118ef744832649f6a176223153dbc4326b83b3;hb=88e187267df754a99dba3222a94e01362986f720;hp=287bba0da9b1759a638e9317be188c14d2ff764f;hpb=752bba7eb39d6f775a3ecb3ca3e19d7884626a4e;p=dcpomatic.git

diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
index 287bba0da..b2118ef74 100644
--- a/src/lib/decoder_factory.cc
+++ b/src/lib/decoder_factory.cc
@@ -23,26 +23,33 @@
 
 #include <boost/filesystem.hpp>
 #include "ffmpeg_decoder.h"
-#include "tiff_decoder.h"
 #include "imagemagick_decoder.h"
 #include "film.h"
+#include "external_audio_decoder.h"
 
 using std::string;
+using std::pair;
+using std::make_pair;
 using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
 
-shared_ptr<Decoder>
+pair<shared_ptr<VideoDecoder>, shared_ptr<AudioDecoder> >
 decoder_factory (
-	shared_ptr<Film> f, shared_ptr<const Options> o, Job* j, bool minimal = false
+	shared_ptr<Film> f, shared_ptr<const Options> o, Job* j
 	)
 {
-	if (boost::filesystem::is_directory (f->content_path ())) {
-		/* Assume a directory contains TIFFs */
-		return shared_ptr<Decoder> (new TIFFDecoder (f, o, j, minimal));
+	if (boost::filesystem::is_directory (f->content_path()) || f->content_type() == STILL) {
+		/* A single image file, or a directory of them */
+		return make_pair (
+			shared_ptr<VideoDecoder> (new ImageMagickDecoder (f, o, j)),
+			shared_ptr<AudioDecoder> ()
+			);
 	}
 
-	if (f->content_type() == STILL) {
-		return shared_ptr<Decoder> (new ImageMagickDecoder (f, o, j, minimal));
+	shared_ptr<FFmpegDecoder> fd (new FFmpegDecoder (f, o, j));
+	if (f->use_content_audio()) {
+		return make_pair (fd, fd);
 	}
-	
-	return shared_ptr<Decoder> (new FFmpegDecoder (f, o, j, minimal));
+
+	return make_pair (fd, shared_ptr<AudioDecoder> (new ExternalAudioDecoder (f, o, j)));
 }