It builds.

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

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index 78ee6801ecd89eb85c755af7f488103570203e8b..efa90fd92c7950280e8c900b42ccf3ce591a1b1d 100644 (file)
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -20,12 +20,11 @@
 #ifndef DCPOMATIC_SUBTITLE_DECODER_H
 #define DCPOMATIC_SUBTITLE_DECODER_H
 
-#include <boost/signals2.hpp>
 #include <dcp/subtitle_string.h>
 #include "decoder.h"
 #include "rect.h"
 #include "types.h"
-#include "decoded.h"
+#include "content_subtitle.h"
 
 class Film;
 class DCPTimedSubtitle;
@@ -36,9 +35,15 @@ class SubtitleDecoder : public virtual Decoder
 public:
        SubtitleDecoder ();
 
+       std::list<boost::shared_ptr<ContentImageSubtitle> > get_image_subtitles (ContentTime from, ContentTime to);
+       std::list<boost::shared_ptr<ContentTextSubtitle> > get_text_subtitles (ContentTime from, ContentTime to);
+
 protected:
-       void image_subtitle (boost::shared_ptr<Image>, dcpomatic::Rect<double>, ContentTime, ContentTime);
+       void image_subtitle (ContentTime from, ContentTime to, boost::shared_ptr<Image>, dcpomatic::Rect<double>);
        void text_subtitle (std::list<dcp::SubtitleString>);
+
+       std::list<boost::shared_ptr<ContentImageSubtitle> > _decoded_image_subtitles;
+       std::list<boost::shared_ptr<ContentTextSubtitle> > _decoded_text_subtitles;
 };
 
 #endif