Re-work again so that there's just one encoder; various tweaks to still-image-with-audio.

1 files changed, 0 insertions, 39 deletions

diff --git a/src/lib/encoder_factory.cc b/src/lib/encoder_factory.cc
deleted file mode 100644
index 8384ecee3..000000000
--- a/src/lib/encoder_factory.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-/** @file  src/encoder_factory.cc
- *  @brief A method to create an appropriate encoder for some content.
- */
-
-#include <boost/filesystem.hpp>
-#include "j2k_video_encoder.h"
-#include "j2k_still_encoder.h"
-#include "film.h"
-
-using boost::shared_ptr;
-
-shared_ptr<Encoder>
-encoder_factory (shared_ptr<const Film> f, shared_ptr<const EncodeOptions> o)
-{
-	if (!boost::filesystem::is_directory (f->content_path()) && f->content_type() == STILL) {
-		return shared_ptr<Encoder> (new J2KStillEncoder (f, o));
-	}
-	
-	return shared_ptr<Encoder> (new J2KVideoEncoder (f, o));
-}