Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index d81b20b5c30d2d4793870aa07e286155b55daf77..6fdbd946af348dcd2f99a7d8306e5c8e6dabeff4 100644 (file)
--- 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"
@@ -26,21 +30,28 @@ 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>, bool fast);
+
+       std::list<boost::shared_ptr<dcp::Reel> > reels () const {
+               return _reels;
+       }
 
 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;
 };