X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdecoder_factory.h;h=1a39f37e24ed06642f80398ffc7025e7dc34a958;hp=88f719ba230307d3932c7136e132fad2dc06f8df;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hpb=9c58fcdb6fd8131c17456dd71c5c277a6b0ae053

diff --git a/src/lib/decoder_factory.h b/src/lib/decoder_factory.h
index 88f719ba2..1a39f37e2 100644
--- a/src/lib/decoder_factory.h
+++ b/src/lib/decoder_factory.h
@@ -1,49 +1,29 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2019 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/>.
 
 */
 
-#ifndef DVDOMATIC_DECODER_FACTORY_H
-#define DVDOMATIC_DECODER_FACTORY_H
-
-/** @file  src/decoder_factory.h
- *  @brief A method to create appropriate decoders for some content.
- */
-
-class Film;
-class Options;
-class Job;
-class VideoDecoder;
-class AudioDecoder;
+class ImageDecoder;
 
-struct Decoders {
-	Decoders () {}
-	
-	Decoders (boost::shared_ptr<VideoDecoder> v, boost::shared_ptr<AudioDecoder> a)
-		: video (v)
-		, audio (a)
-	{}
-
-	boost::shared_ptr<VideoDecoder> video;
-	boost::shared_ptr<AudioDecoder> audio;
-};
-
-extern Decoders decoder_factory (
-	boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *
+extern std::shared_ptr<Decoder> decoder_factory (
+	std::shared_ptr<const Film> film,
+	std::shared_ptr<const Content> content,
+	bool fast,
+	bool tolerant,
+	std::shared_ptr<Decoder> old_decoder
 	);
-
-#endif