X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fdcp_decoder.h;h=ce9a3ef9af3dd7af03e311f2052f58a4abdf8b36;hb=6f344b876689a1234a5eb75041882f06f5d9fe5c;hp=d81b20b5c30d2d4793870aa07e286155b55daf77;hpb=5dc2dbdb6639f8d617a40209ad603d2a38f9df2a;p=dcpomatic.git

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index d81b20b5c..ce9a3ef9a 100644
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,6 +17,10 @@
 
 */
 
+/** @file  src/dcp_decoder.h
+ *  @brief A decoder of existing DCPs.
+ */
+
 #include "video_decoder.h"
 #include "audio_decoder.h"
 #include "subtitle_decoder.h"
@@ -26,21 +30,29 @@ namespace dcp {
 }
 
 class DCPContent;
-class Log;
+struct dcp_subtitle_within_dcp_test;
 
 class DCPDecoder : public VideoDecoder, public AudioDecoder, public SubtitleDecoder
 {
 public:
-	DCPDecoder (boost::shared_ptr<const DCPContent>, boost::shared_ptr<Log>);
+	DCPDecoder (boost::shared_ptr<const DCPContent>, boost::shared_ptr<Log> log, bool fast);
+
+	std::list<boost::shared_ptr<dcp::Reel> > reels () const {
+		return _reels;
+	}
 
 private:
+	friend struct dcp_subtitle_within_dcp_test;
+
+	bool pass (PassReason, bool accurate);
 	void seek (ContentTime t, bool accurate);
-	bool pass ();
-	std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
 
+	std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
+	std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
+
+	/** Time of next thing to return from pass relative to the start of _reel */
 	ContentTime _next;
 	std::list<boost::shared_ptr<dcp::Reel> > _reels;
 	std::list<boost::shared_ptr<dcp::Reel> >::iterator _reel;
-	boost::shared_ptr<Log> _log;
 	boost::shared_ptr<const DCPContent> _dcp_content;
 };