X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=a672e8a10de0c090b8cf9fa520a007d46fe38a37;hb=ccd69987ab861ea4521836fa2a5227e2dfac3479;hp=d2302d7a20d3057bcfde04fd9df1b11934f45420;hpb=24e890682b3f2aa211277ad8b6b3591f2026d4be;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index d2302d7a2..a672e8a10 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,68 +18,63 @@
 
 */
 
+
 /** @file  src/decoder.h
  *  @brief Decoder class.
  */
 
+
 #ifndef DCPOMATIC_DECODER_H
 #define DCPOMATIC_DECODER_H
 
-#include "types.h"
+
 #include "dcpomatic_time.h"
+#include "film.h"
+#include "font_data.h"
+#include "types.h"
+#include "weak_film.h"
 #include <boost/utility.hpp>
 
+
+class AtmosDecoder;
+class AudioDecoder;
 class Decoded;
+class DecoderPart;
+class TextDecoder;
 class VideoDecoder;
-class AudioDecoder;
-class SubtitleDecoder;
+
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
  */
-class Decoder : public boost::noncopyable
+class Decoder : public WeakConstFilm
 {
 public:
+	Decoder (std::weak_ptr<const Film> film);
 	virtual ~Decoder () {}
 
-	boost::shared_ptr<VideoDecoder> video;
-	boost::shared_ptr<AudioDecoder> audio;
-	boost::shared_ptr<SubtitleDecoder> subtitle;
+	Decoder (Decoder const&) = delete;
+	Decoder& operator= (Decoder const&) = delete;
 
-	enum PassReason {
-		PASS_REASON_VIDEO,
-		PASS_REASON_AUDIO,
-		PASS_REASON_SUBTITLE
-	};
+	std::shared_ptr<VideoDecoder> video;
+	std::shared_ptr<AudioDecoder> audio;
+	std::list<std::shared_ptr<TextDecoder>> text;
+	std::shared_ptr<AtmosDecoder> atmos;
 
-	void maybe_seek_video (ContentTime time, bool accurate);
-	void maybe_seek_audio (ContentTime time, bool accurate);
-	void maybe_seek_subtitle (ContentTime time, bool accurate);
+	std::shared_ptr<TextDecoder> only_text () const;
 
-	/** @return true if this decoder has already returned all its data and will give no more */
-	virtual bool pass (PassReason, bool accurate) = 0;
-
-	/** Ensure that any future get() calls return data that reflect
-	 *  changes in our content's settings.
-	 */
-	virtual void reset () {}
-
-protected:
-	boost::optional<ContentTime> _video_position;
-	boost::optional<ContentTime> _audio_position;
-	boost::optional<ContentTime> _subtitle_position;
-
-private:
-	/** Seek so that the next pass() will yield the next thing
-	 *  (video/sound frame, subtitle etc.) at or after the requested
-	 *  time.  Pass accurate = true to try harder to ensure that, at worst,
-	 *  the next thing we yield comes before `time'.  This may entail
-	 *  seeking some way before `time' to be on the safe side.
-	 *  Alternatively, if seeking is 100% accurate for this decoder,
-	 *  it may seek to just the right spot.
+	/** Do some decoding and perhaps emit video, audio or subtitle data.
+	 *  @return true if this decoder will emit no more data unless a seek() happens.
 	 */
-	virtual void seek (ContentTime time, bool accurate) = 0;
-	void maybe_seek (boost::optional<ContentTime>& position, ContentTime time, bool accurate);
+	virtual bool pass () = 0;
+	virtual void seek (dcpomatic::ContentTime time, bool accurate);
+
+	virtual dcpomatic::ContentTime position () const;
+
+	virtual std::vector<dcpomatic::FontData> fonts () const {
+		return {};
+	}
 };
 
+
 #endif