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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 9867b79b0..d2302d7a2 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 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,9 @@
 #include <boost/utility.hpp>
 
 class Decoded;
+class VideoDecoder;
+class AudioDecoder;
+class SubtitleDecoder;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
@@ -38,9 +42,34 @@ class Decoder : public boost::noncopyable
 public:
 	virtual ~Decoder () {}
 
+	boost::shared_ptr<VideoDecoder> video;
+	boost::shared_ptr<AudioDecoder> audio;
+	boost::shared_ptr<SubtitleDecoder> subtitle;
+
+	enum PassReason {
+		PASS_REASON_VIDEO,
+		PASS_REASON_AUDIO,
+		PASS_REASON_SUBTITLE
+	};
+
+	void maybe_seek_video (ContentTime time, bool accurate);
+	void maybe_seek_audio (ContentTime time, bool accurate);
+	void maybe_seek_subtitle (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;
+
+	/** Ensure that any future get() calls return data that reflect
+	 *  changes in our content's settings.
+	 */
+	virtual void reset () {}
+
 protected:
-	friend class AudioDecoderStream;
+	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,
@@ -50,14 +79,7 @@ protected:
 	 *  it may seek to just the right spot.
 	 */
 	virtual void seek (ContentTime time, bool accurate) = 0;
-
-	enum PassReason {
-		PASS_REASON_VIDEO,
-		PASS_REASON_AUDIO,
-		PASS_REASON_SUBTITLE
-	};
-
-	virtual bool pass (PassReason, bool accurate) = 0;
+	void maybe_seek (boost::optional<ContentTime>& position, ContentTime time, bool accurate);
 };
 
 #endif