No-op: remove all trailing whitespace.

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

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index d81b20b5c30d2d4793870aa07e286155b55daf77..7d26139ba47ab6d62a403c066fc091aab30f1c89 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"
@@ -31,16 +35,17 @@ class Log;
 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);
        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;
 };