From 491176352b80bea000564e6662738722185be721 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 19 Jul 2018 13:44:59 +0100 Subject: [PATCH] Remove old content_subtitle. --- src/lib/content_subtitle.h | 74 -------------------------------------- src/lib/player.cc | 3 +- src/lib/player.h | 4 +-- src/lib/text_decoder.cc | 2 +- src/lib/text_decoder.h | 4 +-- src/wx/subtitle_view.cc | 4 +-- src/wx/subtitle_view.h | 4 +-- test/dcp_subtitle_test.cc | 12 +++---- wscript | 1 + 9 files changed, 17 insertions(+), 91 deletions(-) delete mode 100644 src/lib/content_subtitle.h diff --git a/src/lib/content_subtitle.h b/src/lib/content_subtitle.h deleted file mode 100644 index 5a3e8157c..000000000 --- a/src/lib/content_subtitle.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - Copyright (C) 2014 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_CONTENT_SUBTITLE_H -#define DCPOMATIC_CONTENT_SUBTITLE_H - -#include "dcpomatic_time.h" -#include "rect.h" -#include "bitmap_text.h" -#include -#include - -class Image; - -class ContentSubtitle -{ -public: - explicit ContentSubtitle (ContentTime f) - : _from (f) - {} - - ContentTime from () const { - return _from; - } - -private: - ContentTime _from; -}; - -class ContentBitmapText : public ContentSubtitle -{ -public: - ContentBitmapText (ContentTime f, boost::shared_ptr im, dcpomatic::Rect r) - : ContentSubtitle (f) - , sub (im, r) - {} - - /* Our subtitle, with its rectangle unmodified by any offsets or scales that the content specifies */ - BitmapText sub; -}; - -/** A text subtitle. We store the time period separately (as well as in the dcp::SubtitleStrings) - * as the dcp::SubtitleString timings are sometimes quite heavily quantised and this causes problems - * when we want to compare the quantised periods to the unquantised ones. - */ -class ContentTextSubtitle : public ContentSubtitle -{ -public: - ContentTextSubtitle (ContentTime f, std::list s) - : ContentSubtitle (f) - , subs (s) - {} - - std::list subs; -}; - -#endif diff --git a/src/lib/player.cc b/src/lib/player.cc index 92e8141e1..4c9e216e1 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -44,7 +44,6 @@ #include "text_decoder.h" #include "ffmpeg_content.h" #include "audio_content.h" -#include "content_subtitle.h" #include "dcp_decoder.h" #include "image_decoder.h" #include "compose.hpp" @@ -867,7 +866,7 @@ Player::bitmap_text_start (weak_ptr wp, ContentBitmapText subtitle) } void -Player::plain_text_start (weak_ptr wp, ContentTextSubtitle subtitle) +Player::plain_text_start (weak_ptr wp, ContentPlainText subtitle) { shared_ptr piece = wp.lock (); if (!piece) { diff --git a/src/lib/player.h b/src/lib/player.h index b0ffe0e04..abc06721a 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -23,13 +23,13 @@ #include "player_subtitles.h" #include "active_subtitles.h" +#include "content_text.h" #include "film.h" #include "content.h" #include "position_image.h" #include "piece.h" #include "content_video.h" #include "content_audio.h" -#include "content_subtitle.h" #include "audio_stream.h" #include "audio_merger.h" #include "empty.h" @@ -127,7 +127,7 @@ private: void video (boost::weak_ptr, ContentVideo); void audio (boost::weak_ptr, AudioStreamPtr, ContentAudio); void bitmap_text_start (boost::weak_ptr, ContentBitmapText); - void plain_text_start (boost::weak_ptr, ContentTextSubtitle); + void plain_text_start (boost::weak_ptr, ContentPlainText); void subtitle_stop (boost::weak_ptr, ContentTime); DCPTime one_video_frame () const; void fill_audio (DCPTimePeriod period); diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc index 8b825936a..a7271601d 100644 --- a/src/lib/text_decoder.cc +++ b/src/lib/text_decoder.cc @@ -94,7 +94,7 @@ TextDecoder::emit_plain_start (ContentTime from, list s) } } - PlainStart (ContentTextSubtitle (from, s)); + PlainStart (ContentPlainText (from, s)); _position = from; } diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h index 221ed6d37..f9d021b3f 100644 --- a/src/lib/text_decoder.h +++ b/src/lib/text_decoder.h @@ -24,7 +24,7 @@ #include "decoder.h" #include "rect.h" #include "types.h" -#include "content_subtitle.h" +#include "content_text.h" #include "decoder_part.h" #include #include @@ -63,7 +63,7 @@ public: } boost::signals2::signal BitmapStart; - boost::signals2::signal PlainStart; + boost::signals2::signal PlainStart; boost::signals2::signal Stop; private: diff --git a/src/wx/subtitle_view.cc b/src/wx/subtitle_view.cc index 41bf4b049..a3d06106c 100644 --- a/src/wx/subtitle_view.cc +++ b/src/wx/subtitle_view.cc @@ -19,7 +19,7 @@ */ #include "lib/plain_text_decoder.h" -#include "lib/content_subtitle.h" +#include "lib/content_text.h" #include "lib/video_decoder.h" #include "lib/audio_decoder.h" #include "lib/film.h" @@ -91,7 +91,7 @@ SubtitleView::SubtitleView (wxWindow* parent, shared_ptr film, shared_ptr< } void -SubtitleView::data_start (ContentTextSubtitle cts) +SubtitleView::data_start (ContentPlainText cts) { BOOST_FOREACH (dcp::SubtitleString const & i, cts.subs) { wxListItem list_item; diff --git a/src/wx/subtitle_view.h b/src/wx/subtitle_view.h index 94ef52171..7272c608c 100644 --- a/src/wx/subtitle_view.h +++ b/src/wx/subtitle_view.h @@ -18,7 +18,7 @@ */ -#include "lib/content_subtitle.h" +#include "lib/content_text.h" #include #include #include @@ -32,7 +32,7 @@ public: SubtitleView (wxWindow *, boost::shared_ptr, boost::shared_ptr content, boost::shared_ptr, FilmViewer* viewer); private: - void data_start (ContentTextSubtitle cts); + void data_start (ContentPlainText cts); void data_stop (ContentTime time); void subtitle_selected (wxListEvent &); diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc index 026fbd12a..9ea708ed5 100644 --- a/test/dcp_subtitle_test.cc +++ b/test/dcp_subtitle_test.cc @@ -32,7 +32,7 @@ #include "lib/dcp_content_type.h" #include "lib/dcp_text_decoder.h" #include "lib/text_content.h" -#include "lib/content_subtitle.h" +#include "lib/content_text.h" #include "lib/font.h" #include "lib/text_decoder.h" #include "test.h" @@ -43,10 +43,10 @@ using std::list; using boost::shared_ptr; using boost::optional; -optional stored; +optional stored; static void -store (ContentTextSubtitle sub) +store (ContentPlainText sub) { if (!stored) { stored = sub; @@ -93,7 +93,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test) shared_ptr decoder (new DCPDecoder (content, film->log(), false)); decoder->subtitle->PlainStart.connect (bind (store, _1)); - stored = optional (); + stored = optional (); while (!decoder->pass() && !stored) {} BOOST_REQUIRE (stored); @@ -116,7 +116,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test2) shared_ptr decoder (new DCPTextDecoder (content, film->log())); decoder->subtitle->PlainStart.connect (bind (store, _1)); - stored = optional (); + stored = optional (); while (!decoder->pass ()) { if (stored && stored->from() == ContentTime(0)) { BOOST_CHECK_EQUAL (stored->subs.front().text(), "<b>Hello world!</b>"); @@ -140,7 +140,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test3) BOOST_REQUIRE (!wait_for_jobs ()); shared_ptr decoder (new DCPTextDecoder (content, film->log())); - stored = optional (); + stored = optional (); while (!decoder->pass ()) { decoder->subtitle->PlainStart.connect (bind (store, _1)); if (stored && stored->from() == ContentTime::from_seconds(0.08)) { diff --git a/wscript b/wscript index c8a049234..4d16d0504 100644 --- a/wscript +++ b/wscript @@ -99,6 +99,7 @@ def configure(conf): '-Wwrite-strings', # Remove auto_ptr warnings from libxml++-2.6 '-Wno-deprecated-declarations', + '-Wno-unsafe-loop-optimizations', '-Wno-ignored-qualifiers', '-D_FILE_OFFSET_BITS=64']) -- 2.30.2