diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-19 00:42:56 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-19 23:36:56 +0100 |
| commit | d3c009991a782fa51e85828c7600994a9dd91559 (patch) | |
| tree | 8519a3138c11aeb96c8e6c7e8a749c23b7aaf468 /test/dcp_subtitle_test.cc | |
| parent | af2bea29ef9975dadd26297876e2408e5e874a0c (diff) | |
More renaming.
sed -i "s/emit_text/emit_plain/g" src/lib/*.cc src/lib/*.h
sed -i "s/emit_image_start/emit_bitmap_start/g" src/lib/*.cc src/lib/*.h
sed -i "s/emit_text_start/emit_plain_start/g" src/lib/*.cc src/lib/*.h
sed -i "s/render_subtitles/render_text/g" src/lib/*.cc src/lib/*.h src/lib/wscript test/*.cc
sed -i "s/ImageStart/BitmapStart/g" src/lib/*.cc src/lib/*.h
sed -i "s/TextStart/PlainStart/g" src/lib/*.cc src/lib/*.h test/*.cc src/wx/*.cc
sed -i "s/ImageSubtitle/BitmapText/g" src/lib/*.cc src/lib/*.h
sed -i "s/text_subtitle/plain_text/g" src/lib/*.cc src/lib/*.h src/lib/wscript src/wx/*.cc src/wx/*.h test/*.cc
sed -i "s/image_subtitle/bitmap_text/g" src/lib/*.cc src/lib/*.h
mv src/lib/render_subtitles.cc src/lib/render_text.cc
mv src/lib/render_subtitles.h src/lib/render_text.h
mv src/lib/text_subtitle.cc src/lib/plain_text.cc
mv src/lib/text_subtitle.h src/lib/plain_text.h
Diffstat (limited to 'test/dcp_subtitle_test.cc')
| -rw-r--r-- | test/dcp_subtitle_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc index 3d05e143d..026fbd12a 100644 --- a/test/dcp_subtitle_test.cc +++ b/test/dcp_subtitle_test.cc @@ -91,7 +91,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test) BOOST_REQUIRE (!wait_for_jobs ()); shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, film->log(), false)); - decoder->subtitle->TextStart.connect (bind (store, _1)); + decoder->subtitle->PlainStart.connect (bind (store, _1)); stored = optional<ContentTextSubtitle> (); while (!decoder->pass() && !stored) {} @@ -114,7 +114,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test2) BOOST_REQUIRE (!wait_for_jobs ()); shared_ptr<DCPTextDecoder> decoder (new DCPTextDecoder (content, film->log())); - decoder->subtitle->TextStart.connect (bind (store, _1)); + decoder->subtitle->PlainStart.connect (bind (store, _1)); stored = optional<ContentTextSubtitle> (); while (!decoder->pass ()) { @@ -142,7 +142,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test3) shared_ptr<DCPTextDecoder> decoder (new DCPTextDecoder (content, film->log())); stored = optional<ContentTextSubtitle> (); while (!decoder->pass ()) { - decoder->subtitle->TextStart.connect (bind (store, _1)); + decoder->subtitle->PlainStart.connect (bind (store, _1)); if (stored && stored->from() == ContentTime::from_seconds(0.08)) { list<dcp::SubtitleString> s = stored->subs; list<dcp::SubtitleString>::const_iterator i = s.begin (); |