From d7ac100c0eb1b5efdcfbec59be870fd869252840 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 11 Jun 2018 23:50:59 +0100 Subject: 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 --- src/lib/subtitle_decoder.h | 74 ---------------------------------------------- 1 file changed, 74 deletions(-) delete mode 100644 src/lib/subtitle_decoder.h (limited to 'src/lib/subtitle_decoder.h') diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h deleted file mode 100644 index c1f171b1f..000000000 --- a/src/lib/subtitle_decoder.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - Copyright (C) 2013-2017 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 . - -*/ - -#ifndef DCPOMATIC_SUBTITLE_DECODER_H -#define DCPOMATIC_SUBTITLE_DECODER_H - -#include "decoder.h" -#include "rect.h" -#include "types.h" -#include "content_subtitle.h" -#include "decoder_part.h" -#include -#include - -namespace sub { - class Subtitle; -} - -class Image; - -class SubtitleDecoder : public DecoderPart -{ -public: - SubtitleDecoder ( - Decoder* parent, - boost::shared_ptr, - boost::shared_ptr log, - ContentTime first - ); - - ContentTime position () const { - return _position; - } - - void emit_image_start (ContentTime from, boost::shared_ptr image, dcpomatic::Rect rect); - void emit_text_start (ContentTime from, std::list s); - void emit_text_start (ContentTime from, sub::Subtitle const & subtitle); - void emit_text (ContentTimePeriod period, std::list s); - void emit_text (ContentTimePeriod period, sub::Subtitle const & subtitle); - void emit_stop (ContentTime to); - - void seek (); - - boost::shared_ptr content () const { - return _content; - } - - boost::signals2::signal ImageStart; - boost::signals2::signal TextStart; - boost::signals2::signal Stop; - -private: - boost::shared_ptr _content; - ContentTime _position; -}; - -#endif -- cgit v1.2.3