From c1f98c84cdf3829b31929453b8a89fdcbdcd0c42 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 18 Jul 2018 23:40:25 +0100 Subject: More renaming; text -> plain. sed -i "s/TextTextContent/PlainText/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc sed -i "s/text_text/plain_text/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc src/lib/wscript mv src/lib/text_text_content.cc src/lib/plain_text_content.cc mv src/lib/text_text_content.h src/lib/plain_text_content.h mv src/lib/text_text_decoder.cc src/lib/plain_text_decoder.cc mv src/lib/text_text_decoder.h src/lib/plain_text_decoder.h --- src/lib/text_text_decoder.cc | 88 -------------------------------------------- 1 file changed, 88 deletions(-) delete mode 100644 src/lib/text_text_decoder.cc (limited to 'src/lib/text_text_decoder.cc') diff --git a/src/lib/text_text_decoder.cc b/src/lib/text_text_decoder.cc deleted file mode 100644 index 2ae5cd38e..000000000 --- a/src/lib/text_text_decoder.cc +++ /dev/null @@ -1,88 +0,0 @@ -/* - Copyright (C) 2014-2016 Carl Hetherington - - 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 . - -*/ - -#include "text_text_decoder.h" -#include "text_text_content.h" -#include "text_content.h" -#include -#include -#include - -using std::list; -using std::vector; -using std::string; -using std::cout; -using std::max; -using boost::shared_ptr; -using boost::optional; -using boost::dynamic_pointer_cast; - -TextTextDecoder::TextTextDecoder (shared_ptr content, shared_ptr log) - : TextSubtitle (content) - , _next (0) -{ - ContentTime first; - if (!_subtitles.empty()) { - first = content_time_period(_subtitles[0]).from; - } - subtitle.reset (new TextDecoder (this, content->subtitle, log, first)); -} - -void -TextTextDecoder::seek (ContentTime time, bool accurate) -{ - /* It's worth back-tracking a little here as decoding is cheap and it's nice if we don't miss - too many subtitles when seeking. - */ - time -= ContentTime::from_seconds (5); - if (time < ContentTime()) { - time = ContentTime(); - } - - Decoder::seek (time, accurate); - - _next = 0; - while (_next < _subtitles.size() && ContentTime::from_seconds (_subtitles[_next].from.all_as_seconds ()) < time) { - ++_next; - } -} - -bool -TextTextDecoder::pass () -{ - if (_next >= _subtitles.size ()) { - return true; - } - - ContentTimePeriod const p = content_time_period (_subtitles[_next]); - subtitle->emit_text (p, _subtitles[_next]); - - ++_next; - return false; -} - -ContentTimePeriod -TextTextDecoder::content_time_period (sub::Subtitle s) const -{ - return ContentTimePeriod ( - ContentTime::from_seconds (s.from.all_as_seconds()), - ContentTime::from_seconds (s.to.all_as_seconds()) - ); -} -- cgit v1.2.3