Remove old content_subtitle.

diff --git a/src/lib/content_subtitle.h b/src/lib/content_subtitle.h
deleted file mode 100644 (file)
index 5a3e815..0000000
--- a/src/lib/content_subtitle.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-    Copyright (C) 2014 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/>.
-
-*/
-
-#ifndef DCPOMATIC_CONTENT_SUBTITLE_H
-#define DCPOMATIC_CONTENT_SUBTITLE_H
-
-#include "dcpomatic_time.h"
-#include "rect.h"
-#include "bitmap_text.h"
-#include <dcp/subtitle_string.h>
-#include <list>
-
-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<Image> im, dcpomatic::Rect<double> 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<dcp::SubtitleString> s)
-               : ContentSubtitle (f)
-               , subs (s)
-       {}
-
-       std::list<dcp::SubtitleString> subs;
-};
-
-#endif

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 92e8141e14460d4cb17769a3aa3f13186f73d05e..4c9e216e1ecb2e30ccc4ce72e495bc8afc3f39c0 100644 (file)
--- 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<Piece> wp, ContentBitmapText subtitle)
 }
 
 void
-Player::plain_text_start (weak_ptr<Piece> wp, ContentTextSubtitle subtitle)
+Player::plain_text_start (weak_ptr<Piece> wp, ContentPlainText subtitle)
 {
        shared_ptr<Piece> piece = wp.lock ();
        if (!piece) {

diff --git a/src/lib/player.h b/src/lib/player.h
index b0ffe0e0465001c5ad4daa93e8e58120983e2282..abc06721a6c7f0f7818ca1537a15034fe695d905 100644 (file)
--- 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<Piece>, ContentVideo);
        void audio (boost::weak_ptr<Piece>, AudioStreamPtr, ContentAudio);
        void bitmap_text_start (boost::weak_ptr<Piece>, ContentBitmapText);
-       void plain_text_start (boost::weak_ptr<Piece>, ContentTextSubtitle);
+       void plain_text_start (boost::weak_ptr<Piece>, ContentPlainText);
        void subtitle_stop (boost::weak_ptr<Piece>, 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 8b825936a3ddf3f314fd8baa1a279d6a5fbef154..a7271601df19e19f83c58b490c4209e8294bb283 100644 (file)
--- a/src/lib/text_decoder.cc
+++ b/src/lib/text_decoder.cc
@@ -94,7 +94,7 @@ TextDecoder::emit_plain_start (ContentTime from, list<dcp::SubtitleString> 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 221ed6d373d098a49eb751a263edb4b23e597439..f9d021b3f22581f79b5a921abf06358d06e0db44 100644 (file)
--- 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 <dcp/subtitle_string.h>
 #include <boost/signals2.hpp>
@@ -63,7 +63,7 @@ public:
        }
 
        boost::signals2::signal<void (ContentBitmapText)> BitmapStart;
-       boost::signals2::signal<void (ContentTextSubtitle)> PlainStart;
+       boost::signals2::signal<void (ContentPlainText)> PlainStart;
        boost::signals2::signal<void (ContentTime)> Stop;
 
 private:

diff --git a/src/wx/subtitle_view.cc b/src/wx/subtitle_view.cc
index 41bf4b049f86700942b5cf7487a90a8628a7b919..a3d06106c578514ac77cc5a9a819d1466db9c606 100644 (file)
--- 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> 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 94ef5217178c61552c4612008437db76c43bc3d8..7272c608cb3a909be39727638faa871e4994ee23 100644 (file)
--- 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 <boost/shared_ptr.hpp>
 #include <wx/wx.h>
 #include <wx/listctrl.h>
@@ -32,7 +32,7 @@ public:
        SubtitleView (wxWindow *, boost::shared_ptr<Film>, boost::shared_ptr<Content> content, boost::shared_ptr<Decoder>, 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 026fbd12a04f786d4ffadbfc72656c888b44b399..9ea708ed5d4655ec8f090a941d7fc0509b308736 100644 (file)
--- 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<ContentTextSubtitle> stored;
+optional<ContentPlainText> 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<DCPDecoder> decoder (new DCPDecoder (content, film->log(), false));
        decoder->subtitle->PlainStart.connect (bind (store, _1));
 
-       stored = optional<ContentTextSubtitle> ();
+       stored = optional<ContentPlainText> ();
        while (!decoder->pass() && !stored) {}
 
        BOOST_REQUIRE (stored);
@@ -116,7 +116,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test2)
        shared_ptr<DCPTextDecoder> decoder (new DCPTextDecoder (content, film->log()));
        decoder->subtitle->PlainStart.connect (bind (store, _1));
 
-       stored = optional<ContentTextSubtitle> ();
+       stored = optional<ContentPlainText> ();
        while (!decoder->pass ()) {
                if (stored && stored->from() == ContentTime(0)) {
                        BOOST_CHECK_EQUAL (stored->subs.front().text(), "&lt;b&gt;Hello world!&lt;/b&gt;");
@@ -140,7 +140,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test3)
        BOOST_REQUIRE (!wait_for_jobs ());
 
        shared_ptr<DCPTextDecoder> decoder (new DCPTextDecoder (content, film->log()));
-       stored = optional<ContentTextSubtitle> ();
+       stored = optional<ContentPlainText> ();
        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 c8a04923440e72606a539a23ffd46d08713cda08..4d16d0504d0bb43ae9eaf6422162f256bc51c6f9 100644 (file)
--- 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'])