Rename Subtitle -> Text

sed -i "s/SubtitleContent/TextContent/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc
sed -i "s/SubtitleDecoder/TextDecoder/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc
sed -i "s/subtitle_content/text_content/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc src/lib/wscript src/wx/wscript
sed -i "s/subtitle_decoder/text_decoder/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc src/lib/wscript
mv src/lib/subtitle_decoder.cc src/lib/text_decoder.cc
mv src/lib/subtitle_decoder.h src/lib/text_decoder.h
mv src/lib/subtitle_content.cc src/lib/text_content.cc
mv src/lib/subtitle_content.h src/lib/text_content.h
mv src/lib/dcp_subtitle_decoder.cc src/lib/dcp_text_decoder.cc
mv src/lib/dcp_subtitle_decoder.h src/lib/dcp_text_decoder.h
mv src/lib/dcp_subtitle_content.cc src/lib/dcp_text_content.cc
mv src/lib/dcp_subtitle_content.h src/lib/dcp_text_content.h
mv src/lib/text_subtitle_content.cc src/lib/text_text_content.cc
mv src/lib/text_subtitle_content.h src/lib/text_text_content.h
mv src/lib/text_subtitle_decoder.cc src/lib/text_text_decoder.cc
mv src/lib/text_subtitle_decoder.h src/lib/text_text_decoder.h
mv src/wx/timeline_subtitle_content_view.cc src/wx/timeline_text_content_view.cc
mv src/wx/timeline_subtitle_content_view.h src/wx/timeline_text_content_view.h

1 files changed, 0 insertions, 95 deletions

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
deleted file mode 100644
index 46256e93e..000000000
--- a/src/lib/dcp_subtitle_decoder.cc
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-    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;
-	}
-	subtitle.reset (new SubtitleDecoder (this, content->subtitle, 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 text_subtitle() call otherwise the
-	   SubtitleDecoder 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 */
-	}
-
-	subtitle->emit_text (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 ())
-		);
-}