diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-18 23:40:25 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-19 23:36:56 +0100 |
| commit | c1f98c84cdf3829b31929453b8a89fdcbdcd0c42 (patch) | |
| tree | 12ee5a9950fd333c7f298b5b6b82f2821788141f /test/ffmpeg_encoder_test.cc | |
| parent | 65cc06076b46cbd27ccfcf7387894358e2c8ab1e (diff) | |
More renaming; text -> plain.
sed -i "s/TextTextContent/PlainText/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc
sed -i "s/text_text/plain_text/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc src/lib/wscript
mv src/lib/text_text_content.cc src/lib/plain_text_content.cc
mv src/lib/text_text_content.h src/lib/plain_text_content.h
mv src/lib/text_text_decoder.cc src/lib/plain_text_decoder.cc
mv src/lib/text_text_decoder.h src/lib/plain_text_decoder.h
Diffstat (limited to 'test/ffmpeg_encoder_test.cc')
| -rw-r--r-- | test/ffmpeg_encoder_test.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc index cfe607b8d..65f98ed1a 100644 --- a/test/ffmpeg_encoder_test.cc +++ b/test/ffmpeg_encoder_test.cc @@ -24,7 +24,7 @@ #include "lib/image_content.h" #include "lib/video_content.h" #include "lib/audio_content.h" -#include "lib/text_text_content.h" +#include "lib/plain_text_content.h" #include "lib/ratio.h" #include "lib/transcode_job.h" #include "lib/dcp_content.h" @@ -121,7 +121,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test6) film->set_container (Ratio::from_id ("185")); film->set_audio_channels (6); - shared_ptr<TextTextContent> s (new TextTextContent (film, "test/data/subrip2.srt")); + shared_ptr<PlainText> s (new PlainText (film, "test/data/subrip2.srt")); film->examine_and_add_content (s); BOOST_REQUIRE (!wait_for_jobs ()); s->subtitle->set_colour (dcp::Colour (255, 255, 0)); @@ -146,7 +146,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test7) film->examine_and_add_content (c); BOOST_REQUIRE (!wait_for_jobs ()); - shared_ptr<TextTextContent> s (new TextTextContent (film, "test/data/subrip.srt")); + shared_ptr<PlainText> s (new PlainText (film, "test/data/subrip.srt")); film->examine_and_add_content (s); BOOST_REQUIRE (!wait_for_jobs ()); s->subtitle->set_colour (dcp::Colour (255, 255, 0)); @@ -172,7 +172,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test2) film->set_container (Ratio::from_id ("185")); film->set_audio_channels (6); - shared_ptr<TextTextContent> s (new TextTextContent (film, "test/data/subrip2.srt")); + shared_ptr<PlainText> s (new PlainText (film, "test/data/subrip2.srt")); film->examine_and_add_content (s); BOOST_REQUIRE (!wait_for_jobs ()); s->subtitle->set_colour (dcp::Colour (255, 255, 0)); @@ -197,7 +197,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test3) film->examine_and_add_content (c); BOOST_REQUIRE (!wait_for_jobs ()); - shared_ptr<TextTextContent> s (new TextTextContent (film, "test/data/subrip.srt")); + shared_ptr<PlainText> s (new PlainText (film, "test/data/subrip.srt")); film->examine_and_add_content (s); BOOST_REQUIRE (!wait_for_jobs ()); s->subtitle->set_colour (dcp::Colour (255, 255, 0)); |