From bd8fa9a370f1739952c83107352baa08c79d095e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 24 Oct 2012 18:14:10 +0100
Subject: Merge FilmState / Film.

---
 src/lib/encoder_factory.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/lib/encoder_factory.cc')

diff --git a/src/lib/encoder_factory.cc b/src/lib/encoder_factory.cc
index d16150fa6..df45535cf 100644
--- a/src/lib/encoder_factory.cc
+++ b/src/lib/encoder_factory.cc
@@ -24,17 +24,17 @@
 #include <boost/filesystem.hpp>
 #include "j2k_wav_encoder.h"
 #include "j2k_still_encoder.h"
-#include "film_state.h"
+#include "film.h"
 
 using namespace std;
 using namespace boost;
 
 shared_ptr<Encoder>
-encoder_factory (shared_ptr<const FilmState> fs, shared_ptr<const Options> o, Log* l)
+encoder_factory (shared_ptr<const Film> f, shared_ptr<const Options> o)
 {
-	if (!filesystem::is_directory (fs->content_path()) && fs->content_type() == STILL) {
-		return shared_ptr<Encoder> (new J2KStillEncoder (fs, o, l));
+	if (!filesystem::is_directory (f->content_path()) && f->content_type() == STILL) {
+		return shared_ptr<Encoder> (new J2KStillEncoder (f, o));
 	}
 	
-	return shared_ptr<Encoder> (new J2KWAVEncoder (fs, o, l));
+	return shared_ptr<Encoder> (new J2KWAVEncoder (f, o));
 }
-- 
cgit v1.2.3