X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdecoder_factory.cc;h=4b2a594e1e3c365f9b5c692cf7897d594e7994cc;hp=c4d818f497f6d7eec7f173eea9fa445d9a666f21;hb=f0c10e92b849566e458bc323f8783a6fe83e52d2;hpb=32fc1ddb0ee004d18c36155ddcf4d9b3998a7061

diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
index c4d818f49..4b2a594e1 100644
--- a/src/lib/decoder_factory.cc
+++ b/src/lib/decoder_factory.cc
@@ -1,56 +1,78 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic 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,
+    DCP-o-matic 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.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-/** @file  src/decoder_factory.cc
- *  @brief A method to create an appropriate decoder for some content.
- */
-
-#include <boost/filesystem.hpp>
+#include "ffmpeg_content.h"
 #include "ffmpeg_decoder.h"
-#include "imagemagick_decoder.h"
-#include "film.h"
-#include "external_audio_decoder.h"
-#include "decoder_factory.h"
-
-using std::string;
-using std::pair;
-using std::make_pair;
+#include "dcp_content.h"
+#include "dcp_decoder.h"
+#include "image_content.h"
+#include "image_decoder.h"
+#include "string_text_file_content.h"
+#include "string_text_file_decoder.h"
+#include "dcp_subtitle_content.h"
+#include "dcp_subtitle_decoder.h"
+#include "video_mxf_content.h"
+#include "video_mxf_decoder.h"
+#include <boost/foreach.hpp>
+
+using std::list;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
-Decoders
-decoder_factory (
-	shared_ptr<Film> f, DecodeOptions o, Job* j
-	)
+shared_ptr<Decoder>
+decoder_factory (shared_ptr<const Film> film, shared_ptr<const Content> content, bool fast)
 {
-	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<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (content);
+	if (fc) {
+		return shared_ptr<Decoder> (new FFmpegDecoder(film, fc, fast));
+	}
+
+	shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (content);
+	if (dc) {
+		try {
+			return shared_ptr<Decoder> (new DCPDecoder(film, dc, fast));
+		} catch (KDMError& e) {
+			/* This will be found and reported to the user when the content is examined */
+			return shared_ptr<Decoder>();
+		}
+	}
+
+	shared_ptr<const ImageContent> ic = dynamic_pointer_cast<const ImageContent> (content);
+	if (ic) {
+		return shared_ptr<Decoder> (new ImageDecoder(film, ic));
+	}
+
+	shared_ptr<const StringTextFileContent> rc = dynamic_pointer_cast<const StringTextFileContent> (content);
+	if (rc) {
+		return shared_ptr<Decoder> (new StringTextFileDecoder(film, rc));
+	}
+
+	shared_ptr<const DCPSubtitleContent> dsc = dynamic_pointer_cast<const DCPSubtitleContent> (content);
+	if (dsc) {
+		return shared_ptr<Decoder> (new DCPSubtitleDecoder(film, dsc));
 	}
 
-	shared_ptr<FFmpegDecoder> fd (new FFmpegDecoder (f, o, j));
-	if (f->use_content_audio()) {
-		return Decoders (fd, fd);
+	shared_ptr<const VideoMXFContent> vmc = dynamic_pointer_cast<const VideoMXFContent> (content);
+	if (vmc) {
+		return shared_ptr<Decoder> (new VideoMXFDecoder(film, vmc));
 	}
 
-	return Decoders (fd, shared_ptr<AudioDecoder> (new ExternalAudioDecoder (f, o, j)));
+	return shared_ptr<Decoder> ();
 }