X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_decoder.h;h=78ee6801ecd89eb85c755af7f488103570203e8b;hb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda;hp=0c299f61f24a62a47190a61637a6d81e28e601a5;hpb=623f3c66821d6a99bf0e683a8072b99a168f3a1c;p=dcpomatic.git

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index 0c299f61f..78ee6801e 100644
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -17,19 +17,28 @@
 
 */
 
+#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"
 
 class Film;
-class TimedSubtitle;
+class DCPTimedSubtitle;
+class Image;
 
 class SubtitleDecoder : public virtual Decoder
 {
 public:
-	SubtitleDecoder (boost::shared_ptr<const Film>);
-
-	boost::signals2::signal<void (boost::shared_ptr<TimedSubtitle>)> Subtitle;
+	SubtitleDecoder ();
 
 protected:
-	void subtitle (boost::shared_ptr<TimedSubtitle>);
+	void image_subtitle (boost::shared_ptr<Image>, dcpomatic::Rect<double>, ContentTime, ContentTime);
+	void text_subtitle (std::list<dcp::SubtitleString>);
 };
+
+#endif