X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.h;h=d735ca6a5515b65f34ad713cb9cf58b401d336d4;hb=ecedb8cd842bf09a4e44f5cc66e227f9e8711cc5;hp=d81b20b5c30d2d4793870aa07e286155b55daf77;hpb=9e4c091e6ef0f79fab10664e95240de2f14e5702;p=dcpomatic.git

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index d81b20b5c..d735ca6a5 100644
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -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"
@@ -27,20 +31,24 @@ 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>);
 
 private:
-	void seek (ContentTime t, bool accurate);
+	friend struct dcp_subtitle_within_dcp_test;
+
 	bool pass ();
-	std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
+	void seek (ContentTime t, bool accurate);
+
+	std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
+	std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
 
 	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;
 };