Accessor for ClosedCaptionsDialog.

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

diff --git a/src/lib/dcp_subtitle_decoder.h b/src/lib/dcp_subtitle_decoder.h
index 359d191457379f8713ed9ee78035c3ac0a6b0a42..5bf6363ad282630005a81067e0ac1940179e5cd9 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.h
+++ b/src/lib/dcp_subtitle_decoder.h
@@ -18,7 +18,7 @@
 
 */
 
-#include "subtitle_decoder.h"
+#include "text_decoder.h"
 #include "dcp_subtitle.h"
 
 class DCPSubtitleContent;
@@ -26,14 +26,14 @@ class DCPSubtitleContent;
 class DCPSubtitleDecoder : public DCPSubtitle, public Decoder
 {
 public:
-       DCPSubtitleDecoder (boost::shared_ptr<const DCPSubtitleContent>, boost::shared_ptr<Log> log);
+       DCPSubtitleDecoder (boost::shared_ptr<const Film> film, boost::shared_ptr<const DCPSubtitleContent>);
 
        bool pass ();
-       void seek (ContentTime time, bool accurate);
+       void seek (dcpomatic::ContentTime time, bool accurate);
 
 private:
-       ContentTimePeriod content_time_period (dcp::SubtitleString s) const;
+       dcpomatic::ContentTimePeriod content_time_period (boost::shared_ptr<dcp::Subtitle> s) const;
 
-       std::list<dcp::SubtitleString> _subtitles;
-       std::list<dcp::SubtitleString>::const_iterator _next;
+       std::list<boost::shared_ptr<dcp::Subtitle> > _subtitles;
+       std::list<boost::shared_ptr<dcp::Subtitle> >::const_iterator _next;
 };