From bd8fa9a370f1739952c83107352baa08c79d095e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 24 Oct 2012 18:14:10 +0100 Subject: Merge FilmState / Film. --- src/lib/decoder_factory.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/lib/decoder_factory.cc') diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc index c03912094..56fb56296 100644 --- a/src/lib/decoder_factory.cc +++ b/src/lib/decoder_factory.cc @@ -25,27 +25,27 @@ #include "ffmpeg_decoder.h" #include "tiff_decoder.h" #include "imagemagick_decoder.h" -#include "film_state.h" +#include "film.h" using namespace std; using namespace boost; shared_ptr decoder_factory ( - shared_ptr fs, shared_ptr o, Job* j, Log* l, bool minimal = false, bool ignore_length = false + shared_ptr f, shared_ptr o, Job* j, bool minimal = false, bool ignore_length = false ) { - if (filesystem::is_directory (fs->content_path ())) { + if (filesystem::is_directory (f->content_path ())) { /* Assume a directory contains TIFFs */ - return shared_ptr (new TIFFDecoder (fs, o, j, l, minimal, ignore_length)); + return shared_ptr (new TIFFDecoder (f, o, j, minimal, ignore_length)); } - if (fs->content_type() == STILL) { + if (f->content_type() == STILL) { /* Always ignore length of decodes of stills, since the decoder finishes very quickly and it's the encoder that takes the time. */ - return shared_ptr (new ImageMagickDecoder (fs, o, j, l, minimal, true)); + return shared_ptr (new ImageMagickDecoder (f, o, j, minimal, true)); } - return shared_ptr (new FFmpegDecoder (fs, o, j, l, minimal, ignore_length)); + return shared_ptr (new FFmpegDecoder (f, o, j, minimal, ignore_length)); } -- cgit v1.2.3