diff options
| -rw-r--r-- | src/lib/player.cc | 2 | ||||
| -rw-r--r-- | src/lib/text_decoder.cc | 4 | ||||
| -rw-r--r-- | src/lib/text_decoder.h | 2 | ||||
| -rw-r--r-- | src/wx/text_view.cc | 2 | ||||
| -rw-r--r-- | test/dcp_subtitle_test.cc | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index 58b58fe61..9c5472082 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -335,7 +335,7 @@ Player::setup_pieces() (*j)->BitmapStart.connect( bind(&Player::bitmap_text_start, this, weak_ptr<Piece>(piece), weak_ptr<const TextContent>((*j)->content()), _1) ); - (*j)->PlainStart.connect( + (*j)->StringStart.connect( bind(&Player::plain_text_start, this, weak_ptr<Piece>(piece), weak_ptr<const TextContent>((*j)->content()), _1) ); (*j)->Stop.connect( diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc index 6534b6a38..b1813e1c0 100644 --- a/src/lib/text_decoder.cc +++ b/src/lib/text_decoder.cc @@ -134,7 +134,7 @@ TextDecoder::emit_plain_start(ContentTime from, vector<dcp::TextString> subtitle string_texts.push_back(string_text); } - PlainStart(ContentStringText(from, string_texts)); + StringStart(ContentStringText(from, string_texts)); maybe_set_position(from); } @@ -318,7 +318,7 @@ TextDecoder::emit_plain_start(ContentTime from, sub::Subtitle const & sub_subtit } } - PlainStart(ContentStringText(from, string_texts)); + StringStart(ContentStringText(from, string_texts)); maybe_set_position(from); } diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h index 8afe9fae4..b4ebd8b43 100644 --- a/src/lib/text_decoder.h +++ b/src/lib/text_decoder.h @@ -68,7 +68,7 @@ public: static std::string remove_invalid_characters_for_xml(std::string text); boost::signals2::signal<void (ContentBitmapText)> BitmapStart; - boost::signals2::signal<void (ContentStringText)> PlainStart; + boost::signals2::signal<void (ContentStringText)> StringStart; boost::signals2::signal<void (dcpomatic::ContentTime)> Stop; private: diff --git a/src/wx/text_view.cc b/src/wx/text_view.cc index bde7b09e9..64760bc99 100644 --- a/src/wx/text_view.cc +++ b/src/wx/text_view.cc @@ -101,7 +101,7 @@ TextView::TextView ( /* Find the decoder that is being used for our TextContent and attach to it */ for (auto i: decoder->text) { if (i->content() == text) { - i->PlainStart.connect (bind (&TextView::data_start, this, _1)); + i->StringStart.connect(bind(&TextView::data_start, this, _1)); i->Stop.connect (bind (&TextView::data_stop, this, _1)); } } diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc index 3888a7b53..984dfac95 100644 --- a/test/dcp_subtitle_test.cc +++ b/test/dcp_subtitle_test.cc @@ -107,7 +107,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test) auto film = new_test_film("dcp_subtitle_within_dcp_test", { content }); auto decoder = make_shared<DCPDecoder>(film, content, false, false, shared_ptr<DCPDecoder>()); - decoder->only_text()->PlainStart.connect (bind (store, _1)); + decoder->only_text()->StringStart.connect(bind(store, _1)); stored = optional<ContentStringText> (); while (!decoder->pass() && !stored) {} @@ -125,7 +125,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test2) auto film = new_test_film("dcp_subtitle_test2", { content }); auto decoder = make_shared<DCPSubtitleDecoder>(film, content); - decoder->only_text()->PlainStart.connect (bind (store, _1)); + decoder->only_text()->StringStart.connect(bind(store, _1)); stored = optional<ContentStringText> (); while (!decoder->pass()) { @@ -150,7 +150,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test3) auto decoder = make_shared<DCPSubtitleDecoder>(film, content); stored = optional<ContentStringText> (); while (!decoder->pass ()) { - decoder->only_text()->PlainStart.connect (bind (store, _1)); + decoder->only_text()->StringStart.connect(bind(store, _1)); if (stored && stored->from() == ContentTime::from_seconds(0.08)) { auto s = stored->subs; auto i = s.begin (); |