Store mtime in Content.

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

diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h
index d9d351d92dd0286ac879aad61574344f13ea25c0..25125e701ae07d5365fbe1a444ae44f507e2311f 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,13 +18,13 @@
 
 */
 
-#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"
 #include "types.h"
-#include "content_subtitle.h"
+#include "content_text.h"
 #include "decoder_part.h"
 #include <dcp/subtitle_string.h>
 #include <boost/signals2.hpp>
@@ -49,11 +49,11 @@ public:
                return _position;
        }
 
-       void emit_image_start (ContentTime from, boost::shared_ptr<Image> image, dcpomatic::Rect<double> rect);
-       void emit_text_start (ContentTime from, std::list<dcp::SubtitleString> s);
-       void emit_text_start (ContentTime from, sub::Subtitle const & subtitle);
-       void emit_text (ContentTimePeriod period, std::list<dcp::SubtitleString> s);
-       void emit_text (ContentTimePeriod period, sub::Subtitle const & subtitle);
+       void emit_bitmap_start (ContentTime from, 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);
+       void emit_plain (ContentTimePeriod period, sub::Subtitle const & subtitle);
        void emit_stop (ContentTime to);
 
        void seek ();
@@ -62,9 +62,9 @@ public:
                return _content;
        }
 
-       boost::signals2::signal<void (ContentImageSubtitle)> ImageStart;
-       boost::signals2::signal<void (ContentTextSubtitle)> TextStart;
-       boost::signals2::signal<void (ContentTime)> Stop;
+       boost::signals2::signal<void (ContentBitmapText)> BitmapStart;
+       boost::signals2::signal<void (ContentStringText)> PlainStart;
+       boost::signals2::signal<void (ContentTime, TextType)> Stop;
 
 private:
        boost::shared_ptr<const TextContent> _content;