X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=da5be4af679ccbda8b7c2100e2af3e5ce52b82e6;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=38556c8188a3932a319c5c3c3a7e463fa0fde435;hpb=2c0478d2b33906845b9d910668b12fe3e8f03a7c;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 38556c818..da5be4af6 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -1,56 +1,71 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 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 "types.h"
+#include "film.h"
+#include "font_data.h"
 #include "dcpomatic_time.h"
+#include "weak_film.h"
+#include <boost/utility.hpp>
 
 class Decoded;
-class Film;
+class VideoDecoder;
+class AudioDecoder;
+class TextDecoder;
+class AtmosDecoder;
+class DecoderPart;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
  */
-class Decoder : public boost::noncopyable
+class Decoder : public boost::noncopyable, public WeakConstFilm
 {
 public:
+	Decoder (std::weak_ptr<const Film> film);
 	virtual ~Decoder () {}
 
-protected:	
-	/** 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.  Note that seeking to time t may mean that
-	 *  the next pass() yields, for example, audio at time t and then
-	 *  video before it.
+	std::shared_ptr<VideoDecoder> video;
+	std::shared_ptr<AudioDecoder> audio;
+	std::list<std::shared_ptr<TextDecoder> > text;
+	std::shared_ptr<AtmosDecoder> atmos;
+
+	std::shared_ptr<TextDecoder> only_text () const;
+
+	/** 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;
 	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 std::vector<dcpomatic::FontData>();
+	}
 };
 
 #endif