Various small fixes to appearance of content properties dialog.

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

diff --git a/src/lib/ffmpeg_subtitle_stream.h b/src/lib/ffmpeg_subtitle_stream.h
index 3ed931b8c996b1691cf0acbe25dc9434d28b1cd1..175eeacef036eb26b75b34faf7596d1826a2d195 100644 (file)
--- a/src/lib/ffmpeg_subtitle_stream.h
+++ b/src/lib/ffmpeg_subtitle_stream.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 */
 
 #include "dcpomatic_time.h"
+#include "rgba.h"
 #include "ffmpeg_stream.h"
 
 class FFmpegSubtitleStream : public FFmpegStream
@@ -26,16 +27,35 @@ public:
        FFmpegSubtitleStream (std::string n, int i)
                : FFmpegStream (n, i)
        {}
-       
-       FFmpegSubtitleStream (cxml::ConstNodePtr);
+
+       FFmpegSubtitleStream (cxml::ConstNodePtr, int version);
 
        void as_xml (xmlpp::Node *) const;
 
-       void add_subtitle (ContentTimePeriod period);
-       std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod period, bool starting) const;
-       ContentTime find_subtitle_to (ContentTime from) const;
+       void add_image_subtitle (std::string id, ContentTimePeriod period);
+       void add_text_subtitle (std::string id, ContentTimePeriod period);
+       std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod period, bool starting) const;
+       std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod period, bool starting) const;
+       ContentTime find_subtitle_to (std::string id) const;
+       void add_offset (ContentTime offset);
+       void set_colour (RGBA from, RGBA to);
+
+       bool has_image_subtitles () const {
+               return !_image_subtitles.empty ();
+       }
+       bool has_text_subtitles () const {
+               return !_text_subtitles.empty ();
+       }
+       std::map<RGBA, RGBA> colours () const;
 
 private:
-       std::map<ContentTime, ContentTime> _subtitles;
-};
 
+       typedef std::map<std::string, ContentTimePeriod> PeriodMap;
+
+       void as_xml (xmlpp::Node *, PeriodMap const & subs, std::string node) const;
+       std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod period, bool starting, PeriodMap const & subs) const;
+
+       PeriodMap _image_subtitles;
+       PeriodMap _text_subtitles;
+       std::map<RGBA, RGBA> _colours;
+};