From 9cb73fbc0fa4643612f01665bc6d9fc430656f32 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 19 Jul 2018 21:48:27 +0100 Subject: Reword again: Text -> Caption and Plain -> Text. sed -i "s/ActiveText/ActiveCaptions/g" src/lib/*.{cc,h} sed -i "s/active_text.h/active_captions.h/g" src/lib/*.{cc,h} sed -i "s/active_text.cc/active_captions.cc/g" src/lib/wscript mv src/lib/active_text.cc src/lib/active_captions.cc mv src/lib/active_text.h src/lib/active_captions.h sed -i "s/PlainTextFileContent/TextCaptionFileContent/g" src/lib/*.{cc,h} src/wx/*.cc sed -i "s/PlainTextFile/TextCaptionFile/g" src/lib/*.{cc,h} src/wx/*.cc sed -i "s/plain_text_file_content/text_caption_file_content/g" src/lib/*.{cc,h} src/lib/wscript src/wx/*.{cc,h} test/*.cc mv src/lib/plain_text_file_content.cc src/lib/text_caption_file_content.cc mv src/lib/plain_text_file_content.h src/lib/text_caption_file_content.h sed -i "s/PlainTextFileDecoder/TextCaptionFileDecoder/g" src/lib/*.{cc,h} sed -i "s/plain_text_file_decoder/text_caption_file_decoder/g" src/lib/*.{cc,h} src/lib/wscript src/wx/*.{cc,h} mv src/lib/plain_text_file_decoder.cc src/lib/text_caption_file_decoder.cc mv src/lib/plain_text_file_decoder.h src/lib/text_caption_file_decoder.h sed -i "s/PlayerText/PlayerCaption/g" src/lib/*.{cc,h} sed -i "s/player_text.cc/player_caption.cc/g" src/lib/wscript sed -i "s/player_text.h/player_caption.h/g" src/lib/*.{cc,h} mv src/lib/player_text.cc src/lib/player_caption.cc mv src/lib/player_text.h src/lib/player_caption.h sed -i "s/ContentPlainText/ContentTextCaption/g" src/lib/*.{cc,h} src/wx/*.{cc,h} sed -i "s/ContentBitmapText/ContentBitmapCaption/g" src/lib/*.{cc,h} src/wx/*.{cc,h} sed -i "s/PlainText/TextCaption/g" src/lib/*.{cc,h} test/*.cc sed -i "s/plain_text.h/text_caption.h/g" src/lib/*.{cc,h} mv src/lib/plain_text.h src/lib/text_caption.h --- src/lib/active_text.cc | 139 ------------------------------------------------- 1 file changed, 139 deletions(-) delete mode 100644 src/lib/active_text.cc (limited to 'src/lib/active_text.cc') diff --git a/src/lib/active_text.cc b/src/lib/active_text.cc deleted file mode 100644 index 885aa034c..000000000 --- a/src/lib/active_text.cc +++ /dev/null @@ -1,139 +0,0 @@ -/* - Copyright (C) 2017-2018 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 "active_text.h" -#include "piece.h" -#include "text_content.h" -#include -#include - -using std::list; -using std::pair; -using std::make_pair; -using boost::weak_ptr; -using boost::shared_ptr; -using boost::optional; - -/** Get the subtitles that should be burnt into a given period. - * @param period Period of interest. - * @param always_burn_subtitles Always burn subtitles even if their content is not set to burn. - */ -list -ActiveText::get_burnt (DCPTimePeriod period, bool always_burn_subtitles) const -{ - list ps; - - for (Map::const_iterator i = _data.begin(); i != _data.end(); ++i) { - - shared_ptr piece = i->first.lock (); - if (!piece) { - continue; - } - - if (!piece->content->subtitle->use() || (!always_burn_subtitles && !piece->content->subtitle->burn())) { - /* Not burning this piece */ - continue; - } - - BOOST_FOREACH (Period j, i->second) { - DCPTimePeriod test (j.from, j.to.get_value_or(DCPTime::max())); - optional overlap = period.overlap (test); - if (overlap && overlap->duration() > DCPTime(period.duration().get() / 2)) { - ps.push_back (j.subs); - } - } - } - - return ps; -} - -/** Remove subtitles that finish before a given time from our list. - * @param time Time to remove before. - */ -void -ActiveText::clear_before (DCPTime time) -{ - Map updated; - for (Map::const_iterator i = _data.begin(); i != _data.end(); ++i) { - list as; - BOOST_FOREACH (Period j, i->second) { - if (!j.to || j.to.get() >= time) { - as.push_back (j); - } - } - if (!as.empty ()) { - updated[i->first] = as; - } - } - _data = updated; -} - -/** Add a new subtitle with a from time. - * @param piece Piece that the subtitle is from. - * @param ps Subtitles. - * @param from From time for these subtitles. - */ -void -ActiveText::add_from (weak_ptr piece, PlayerText ps, DCPTime from) -{ - if (_data.find(piece) == _data.end()) { - _data[piece] = list(); - } - _data[piece].push_back (Period (ps, from)); -} - -/** Add the to time for the last subtitle added from a piece. - * @param piece Piece that the subtitle is from. - * @param to To time for the last subtitle submitted to add_from for this piece. - * @return Return the corresponding subtitles and their from time. - */ -pair -ActiveText::add_to (weak_ptr piece, DCPTime to) -{ - DCPOMATIC_ASSERT (_data.find(piece) != _data.end()); - - _data[piece].back().to = to; - - BOOST_FOREACH (PlainText& i, _data[piece].back().subs.text) { - i.set_out (dcp::Time(to.seconds(), 1000)); - } - - return make_pair (_data[piece].back().subs, _data[piece].back().from); -} - -/** @param piece A piece. - * @return true if we have any active subtitles from this piece. - */ -bool -ActiveText::have (weak_ptr piece) const -{ - Map::const_iterator i = _data.find(piece); - if (i == _data.end()) { - return false; - } - - return !i->second.empty(); -} - -void -ActiveText::clear () -{ - _data.clear (); -} -- cgit v1.2.3