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, 114 deletions

diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
deleted file mode 100644
index 8fee0b2ed..000000000
--- a/src/lib/dcp_subtitle_content.cc
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-    Copyright (C) 2014-2015 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 "font.h"
-#include "dcp_subtitle_content.h"
-#include "film.h"
-#include "subtitle_content.h"
-#include <dcp/raw_convert.h>
-#include <dcp/interop_subtitle_asset.h>
-#include <dcp/smpte_subtitle_asset.h>
-#include <dcp/interop_load_font_node.h>
-#include <libxml++/libxml++.h>
-#include <boost/foreach.hpp>
-
-#include "i18n.h"
-
-using std::string;
-using std::list;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
-using dcp::raw_convert;
-
-DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
-	: Content (film, path)
-{
-	subtitle.reset (new SubtitleContent (this));
-}
-
-DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
-	: Content (film, node)
-	, _length (node->number_child<ContentTime::Type> ("Length"))
-{
-	subtitle = SubtitleContent::from_xml (this, node, version);
-}
-
-void
-DCPSubtitleContent::examine (shared_ptr<Job> job)
-{
-	Content::examine (job);
-
-	shared_ptr<dcp::SubtitleAsset> sc = load (path (0));
-
-	shared_ptr<dcp::InteropSubtitleAsset> iop = dynamic_pointer_cast<dcp::InteropSubtitleAsset> (sc);
-	shared_ptr<dcp::SMPTESubtitleAsset> smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset> (sc);
-	if (smpte) {
-		set_video_frame_rate (smpte->edit_rate().numerator);
-	}
-
-	boost::mutex::scoped_lock lm (_mutex);
-
-	/* Default to turning these subtitles on */
-	subtitle->set_use (true);
-
-	if (iop) {
-		subtitle->set_language (iop->language ());
-	} else if (smpte) {
-		subtitle->set_language (smpte->language().get_value_or (""));
-	}
-
-	_length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds ());
-
-	BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, sc->load_font_nodes ()) {
-		subtitle->add_font (shared_ptr<Font> (new Font (i->id)));
-	}
-}
-
-DCPTime
-DCPSubtitleContent::full_length () const
-{
-	FrameRateChange const frc (active_video_frame_rate(), film()->video_frame_rate());
-	return DCPTime (_length, frc);
-}
-
-string
-DCPSubtitleContent::summary () const
-{
-	return path_summary() + " " + _("[subtitles]");
-}
-
-string
-DCPSubtitleContent::technical_summary () const
-{
-	return Content::technical_summary() + " - " + _("DCP XML subtitles");
-}
-
-void
-DCPSubtitleContent::as_xml (xmlpp::Node* node, bool with_paths) const
-{
-	node->add_child("Type")->add_child_text ("DCPSubtitle");
-	Content::as_xml (node, with_paths);
-
-	if (subtitle) {
-		subtitle->as_xml (node);
-	}
-
-	node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));
-}