X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder_factory.cc;h=feaa1c7ef2f64a51667fcd69c8565b2275277fbc;hb=127672223cca569986e35c91265e269ed5a6561c;hp=c4d818f497f6d7eec7f173eea9fa445d9a666f21;hpb=b1873c51b2e8265a01a8f0eced7fc3465f1677dc;p=dcpomatic.git

diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
index c4d818f49..feaa1c7ef 100644
--- a/src/lib/decoder_factory.cc
+++ b/src/lib/decoder_factory.cc
@@ -25,7 +25,7 @@
 #include "ffmpeg_decoder.h"
 #include "imagemagick_decoder.h"
 #include "film.h"
-#include "external_audio_decoder.h"
+#include "sndfile_decoder.h"
 #include "decoder_factory.h"
 
 using std::string;
@@ -36,21 +36,8 @@ using boost::dynamic_pointer_cast;
 
 Decoders
 decoder_factory (
-	shared_ptr<Film> f, DecodeOptions o, Job* j
+	shared_ptr<Film> f, DecodeOptions o
 	)
 {
-	if (boost::filesystem::is_directory (f->content_path()) || f->content_type() == STILL) {
-		/* A single image file, or a directory of them */
-		return Decoders (
-			shared_ptr<VideoDecoder> (new ImageMagickDecoder (f, o, j)),
-			shared_ptr<AudioDecoder> (new ExternalAudioDecoder (f, o, j))
-			);
-	}
-
-	shared_ptr<FFmpegDecoder> fd (new FFmpegDecoder (f, o, j));
-	if (f->use_content_audio()) {
-		return Decoders (fd, fd);
-	}
-
-	return Decoders (fd, shared_ptr<AudioDecoder> (new ExternalAudioDecoder (f, o, j)));
+	return Decoders ();
 }