Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h
index 96eba80e2ca527442357ec87921f36f1ae3b4812..d45e37fc7c78817abc30f4d1e739ab920156c04f 100644 (file)
--- a/src/lib/text_decoder.h
+++ b/src/lib/text_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,8 +18,8 @@
 
 */
 
-#ifndef DCPOMATIC_SUBTITLE_DECODER_H
-#define DCPOMATIC_SUBTITLE_DECODER_H
+#ifndef DCPOMATIC_CAPTION_DECODER_H
+#define DCPOMATIC_CAPTION_DECODER_H
 
 #include "decoder.h"
 #include "rect.h"
@@ -50,6 +50,7 @@ public:
        }
 
        void emit_bitmap_start (ContentTime from, boost::shared_ptr<Image> image, dcpomatic::Rect<double> rect);
+       void emit_bitmap (ContentTimePeriod period, boost::shared_ptr<Image> image, dcpomatic::Rect<double> rect);
        void emit_plain_start (ContentTime from, std::list<dcp::SubtitleString> s);
        void emit_plain_start (ContentTime from, sub::Subtitle const & subtitle);
        void emit_plain (ContentTimePeriod period, std::list<dcp::SubtitleString> s);
@@ -63,8 +64,8 @@ public:
        }
 
        boost::signals2::signal<void (ContentBitmapText)> BitmapStart;
-       boost::signals2::signal<void (ContentPlainText)> PlainStart;
-       boost::signals2::signal<void (ContentTime, TextType)> Stop;
+       boost::signals2::signal<void (ContentStringText)> PlainStart;
+       boost::signals2::signal<void (ContentTime)> Stop;
 
 private:
        boost::shared_ptr<const TextContent> _content;