Clean up after previous commit.

1 files changed, 95 insertions, 0 deletions

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
new file mode 100644
index 000000000..c7a9a863f
--- /dev/null
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -0,0 +1,95 @@
+/*
+    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "dcp_subtitle_decoder.h"
+#include "dcp_subtitle_content.h"
+#include <dcp/interop_subtitle_asset.h>
+#include <iostream>
+
+using std::list;
+using std::cout;
+using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
+using boost::bind;
+
+DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content, shared_ptr<Log> log)
+{
+	shared_ptr<dcp::SubtitleAsset> c (load (content->path (0)));
+	_subtitles = c->subtitles ();
+	_next = _subtitles.begin ();
+
+	ContentTime first;
+	if (_next != _subtitles.end()) {
+		first = content_time_period(*_next).from;
+	}
+	caption.reset (new CaptionDecoder (this, content->caption, log, first));
+}
+
+void
+DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
+{
+	Decoder::seek (time, accurate);
+
+	_next = _subtitles.begin ();
+	list<shared_ptr<dcp::Subtitle> >::const_iterator i = _subtitles.begin ();
+	while (i != _subtitles.end() && ContentTime::from_seconds ((*_next)->in().as_seconds()) < time) {
+		++i;
+	}
+}
+
+bool
+DCPSubtitleDecoder::pass ()
+{
+	if (_next == _subtitles.end ()) {
+		return true;
+	}
+
+	/* Gather all subtitles with the same time period that are next
+	   on the list.  We must emit all subtitles for the same time
+	   period with the same plain_text() call otherwise the
+	   CaptionDecoder will assume there is nothing else at the
+	   time of emit the first.
+	*/
+
+	list<dcp::SubtitleString> s;
+	ContentTimePeriod const p = content_time_period (*_next);
+
+	while (_next != _subtitles.end () && content_time_period (*_next) == p) {
+		shared_ptr<dcp::SubtitleString> ns = dynamic_pointer_cast<dcp::SubtitleString>(*_next);
+		if (ns) {
+			s.push_back (*ns);
+			++_next;
+		}
+
+		/* XXX: image subtitles */
+	}
+
+	caption->emit_plain (p, s);
+	return false;
+}
+
+ContentTimePeriod
+DCPSubtitleDecoder::content_time_period (shared_ptr<dcp::Subtitle> s) const
+{
+	return ContentTimePeriod (
+		ContentTime::from_seconds (s->in().as_seconds ()),
+		ContentTime::from_seconds (s->out().as_seconds ())
+		);
+}