Basics of splitting up Decoder tree like Content.

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

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 15220810d0f63b5e9c871121084d110d7579f1ba..6e58c490453cb1dfaf1de29fb5a483bd18db1f20 100644 (file)
--- 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
@@ -21,31 +21,35 @@
  *  @brief A decoder of existing DCPs.
  */
 
-#include "video_decoder.h"
-#include "audio_decoder.h"
-#include "subtitle_decoder.h"
+#include "decoder.h"
 
 namespace dcp {
        class Reel;
 }
 
 class DCPContent;
+class Log;
 struct dcp_subtitle_within_dcp_test;
 
-class DCPDecoder : public VideoDecoder, public AudioDecoder, public SubtitleDecoder
+class DCPDecoder : public Decoder
 {
 public:
-       DCPDecoder (boost::shared_ptr<const DCPContent>, bool fast);
+       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 ();
+       bool pass (PassReason, bool accurate);
        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;
 
+       /** 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;