Runs.

[dcpomatic.git] / src / lib / decoder_factory.cc

diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
index 1d8d12cd552bf3f7236243d489026359fb94b3d5..feaa1c7ef2f64a51667fcd69c8565b2275277fbc 100644 (file)
--- 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, shared_ptr<const 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> ()
-                       );
-       }
-
-       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 ();
 }