Take Film pointer out of Content.

[dcpomatic.git] / src / lib / decoder.h

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index d87ff610ac47d3a9eae2eb795ac072a397c26b3f..a8a67ee72624224afdb4af65db9d4522a7a6f23a 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -32,8 +32,9 @@
 class Decoded;
 class VideoDecoder;
 class AudioDecoder;
-class SubtitleDecoder;
+class TextDecoder;
 class DecoderPart;
+class Film;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
@@ -45,15 +46,17 @@ public:
 
        boost::shared_ptr<VideoDecoder> video;
        boost::shared_ptr<AudioDecoder> audio;
-       boost::shared_ptr<SubtitleDecoder> subtitle;
+       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);
+       virtual bool pass (boost::shared_ptr<const Film> film) = 0;
+       virtual void seek (boost::shared_ptr<const Film> film, ContentTime time, bool accurate);
 
-       ContentTime position () const;
+       ContentTime position (boost::shared_ptr<const Film> film) const;
 };
 
 #endif