X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=93c212b344c97c2b9277e4be45a6a2d0d8209115;hp=aeb39d0b2a05483cc2afe5f736e0534d44658d5d;hb=4285355ff2bec853924647f0523d121860fe64e3;hpb=09806bc8d6a48fc79d923ec1cdf6f90176bf8b6a

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index aeb39d0b2..93c212b34 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -1,37 +1,40 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 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 "dcpomatic_time.h"
+#include <boost/utility.hpp>
 
-class Film;
 class Decoded;
+class VideoDecoder;
+class AudioDecoder;
+class TextDecoder;
+class DecoderPart;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
@@ -39,39 +42,28 @@ class Decoded;
 class Decoder : public boost::noncopyable
 {
 public:
-	Decoder (boost::shared_ptr<const Film>);
+	Decoder (boost::weak_ptr<const Film> film);
 	virtual ~Decoder () {}
 
-	/** Seek so that the next peek() 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.
+	boost::shared_ptr<VideoDecoder> video;
+	boost::shared_ptr<AudioDecoder> audio;
+	std::list<boost::shared_ptr<TextDecoder> > text;
+
+	boost::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 bool pass () = 0;
 	virtual void seek (ContentTime time, bool accurate);
-	
-	boost::shared_ptr<Decoded> peek ();
 
-	/* Consume the last peek()ed thing so that it won't be returned
-	 * from the next peek().
-	 */
-	void consume ();
+	virtual ContentTime position () const;
 
 protected:
+	boost::shared_ptr<const Film> film () const;
 
-	/** Perform one decode pass of the content, which may or may not
-	 *  result in a complete quantum (Decoded object) of decoded stuff
-	 *  being added to _pending.
-	 *  @return true if the decoder is done (i.e. no more data will be
-	 *  produced by any future calls to pass() without a seek() first).
-	 */
-	virtual bool pass () = 0;
-	virtual void flush () {};
-	
-	/** The Film that we are decoding in */
+private:
 	boost::weak_ptr<const Film> _film;
-
-	std::list<boost::shared_ptr<Decoded> > _pending;
-	bool _done;
 };
 
 #endif