X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=a672e8a10de0c090b8cf9fa520a007d46fe38a37;hb=2d4e8c5f69cc694625ad95dcee554499605f823b;hp=aa36d41b496341ea7d8d66b8436171b11231e5b9;hpb=097a1fb413bbbb89182161d4c1a31daa5419ec96;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index aa36d41b4..a672e8a10 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -1,65 +1,80 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 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.h
- *  @brief Parent class for decoders of content.
+ *  @brief Decoder class.
  */
 
+
 #ifndef DCPOMATIC_DECODER_H
 #define DCPOMATIC_DECODER_H
 
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-#include <boost/utility.hpp>
+
+#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 Film;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
  */
-class Decoder : public boost::noncopyable
+class Decoder : public WeakConstFilm
 {
 public:
-	Decoder (boost::shared_ptr<const Film>);
+	Decoder (std::weak_ptr<const Film> film);
 	virtual ~Decoder () {}
 
-	/** Perform one decode pass of the content, which may or may not
-	 *  cause the object to emit some data.
-	 */
-	virtual void pass () = 0;
+	Decoder (Decoder const&) = delete;
+	Decoder& operator= (Decoder const&) = delete;
 
-	/** 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 get close to
-	 *  the request.
-	 */
-	virtual void seek (DCPTime time, bool accurate) = 0;
+	std::shared_ptr<VideoDecoder> video;
+	std::shared_ptr<AudioDecoder> audio;
+	std::list<std::shared_ptr<TextDecoder>> text;
+	std::shared_ptr<AtmosDecoder> atmos;
 
-	virtual bool done () const = 0;
+	std::shared_ptr<TextDecoder> only_text () const;
 
-protected:
+	/** 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 bool pass () = 0;
+	virtual void seek (dcpomatic::ContentTime time, bool accurate);
+
+	virtual dcpomatic::ContentTime position () const;
 
-	virtual void flush () {};
-	
-	/** The Film that we are decoding in */
-	boost::weak_ptr<const Film> _film;
+	virtual std::vector<dcpomatic::FontData> fonts () const {
+		return {};
+	}
 };
 
+
 #endif