X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=1b330316ecc7c5c8812720ba4c8f1835f12fda9c;hp=10bb4531032e4d0068340b14c985d9b401ac2fb5;hb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;hpb=accc190af4322fb3d75eaa6958d1e80eef867aba

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 10bb45310..1b330316e 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2015 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/>.
 
 */
 
@@ -29,6 +30,10 @@
 #include <boost/utility.hpp>
 
 class Decoded;
+class VideoDecoder;
+class AudioDecoder;
+class TextDecoder;
+class DecoderPart;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
@@ -38,27 +43,19 @@ class Decoder : public boost::noncopyable
 public:
 	virtual ~Decoder () {}
 
-protected:
-	friend class AudioDecoderStream;
+	boost::shared_ptr<VideoDecoder> video;
+	boost::shared_ptr<AudioDecoder> audio;
+	std::list<boost::shared_ptr<TextDecoder> > caption;
 
-	/** 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.
-	 */
-	virtual void seek (ContentTime time, bool accurate) = 0;
+	boost::shared_ptr<TextDecoder> only_caption () const;
 
-	enum PassReason {
-		PASS_REASON_VIDEO,
-		PASS_REASON_AUDIO,
-		PASS_REASON_SUBTITLE
-	};
+	/** 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);
 
-	/** @return true if this decoder has already returned all its data and will give no more */
-	virtual bool pass (PassReason, bool accurate) = 0;
+	ContentTime position () const;
 };
 
 #endif