X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=92082ca18b105a62f9dd9aec909625c12ac875c9;hb=e0b2ef3dbac6fc4900cad6fea4395c212578602b;hp=0ec73ba91f47147af16b057dcef31004a0b75c47;hpb=1dcfb3a26085ebb3703f40e2f51e43ce3d98be50;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 0ec73ba91..92082ca18 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -1,19 +1,20 @@
 /*
-    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/>.
 
 */
 
@@ -24,14 +25,16 @@
 #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 Decoded;
-class Film;
+class VideoDecoder;
+class AudioDecoder;
+class TextDecoder;
+class DecoderPart;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
@@ -39,18 +42,28 @@ class Film;
 class Decoder : public boost::noncopyable
 {
 public:
+	Decoder (boost::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.
+	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 void seek (ContentTime time, bool accurate) = 0;
 	virtual bool pass () = 0;
+	virtual void seek (dcpomatic::ContentTime time, bool accurate);
+
+	dcpomatic::ContentTime position () const;
+
+protected:
+	boost::shared_ptr<const Film> film () const;
+
+private:
+	boost::weak_ptr<const Film> _film;
 };
 
 #endif