X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_subtitle_stream.cc;h=413477865cf189481180bf0eaefa616bc7dc055c;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=3d8fd4e8375466710cb51ffd4a6a7a4ac950c75e;hpb=39029279954b1f346d3ba28ec12c58211bfa7436;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_subtitle_stream.cc b/src/lib/ffmpeg_subtitle_stream.cc
index 3d8fd4e83..413477865 100644
--- a/src/lib/ffmpeg_subtitle_stream.cc
+++ b/src/lib/ffmpeg_subtitle_stream.cc
@@ -18,6 +18,13 @@
 */
 
 #include "ffmpeg_subtitle_stream.h"
+#include "raw_convert.h"
+#include <libxml++/libxml++.h>
+#include <boost/foreach.hpp>
+
+using std::string;
+using std::map;
+using std::list;
 
 /** Construct a SubtitleStream from a value returned from to_string().
  *  @param t String returned from to_string().
@@ -26,11 +33,54 @@
 FFmpegSubtitleStream::FFmpegSubtitleStream (cxml::ConstNodePtr node)
 	: FFmpegStream (node)
 {
-	
+	BOOST_FOREACH (cxml::NodePtr i, node->node_children ("Period")) {
+		add_subtitle (
+			ContentTimePeriod (
+				ContentTime (i->number_child<ContentTime::Type> ("From")),
+				ContentTime (i->number_child<ContentTime::Type> ("To"))
+				)
+			);
+	}
 }
 
 void
 FFmpegSubtitleStream::as_xml (xmlpp::Node* root) const
 {
 	FFmpegStream::as_xml (root);
+
+	for (map<ContentTime, ContentTime>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
+		xmlpp::Node* node = root->add_child ("Period");
+		node->add_child("From")->add_child_text (raw_convert<string> (i->first.get ()));
+		node->add_child("To")->add_child_text (raw_convert<string> (i->second.get ()));
+	}
+}
+
+void
+FFmpegSubtitleStream::add_subtitle (ContentTimePeriod period)
+{
+	DCPOMATIC_ASSERT (_subtitles.find (period.from) == _subtitles.end ());
+	_subtitles[period.from] = period.to;
+}
+
+list<ContentTimePeriod>
+FFmpegSubtitleStream::subtitles_during (ContentTimePeriod period, bool starting) const
+{
+	list<ContentTimePeriod> d;
+
+	/* XXX: inefficient */
+	for (map<ContentTime, ContentTime>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
+		if ((starting && period.contains (i->first)) || (!starting && period.overlaps (ContentTimePeriod (i->first, i->second)))) {
+			d.push_back (ContentTimePeriod (i->first, i->second));
+		}
+	}
+
+	return d;
+}
+
+ContentTime
+FFmpegSubtitleStream::find_subtitle_to (ContentTime from) const
+{
+	map<ContentTime, ContentTime>::const_iterator i = _subtitles.find (from);
+	DCPOMATIC_ASSERT (i != _subtitles.end ());
+	return i->second;
 }