diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-19 22:44:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-19 23:45:23 +0100 |
| commit | 27b83475435dda4e84a90cf59a52f150905c4ab1 (patch) | |
| tree | 51d0158c7a879f6b2f3c40843c5e5e455069a1dc /test/ffmpeg_encoder_test.cc | |
| parent | 9cb73fbc0fa4643612f01665bc6d9fc430656f32 (diff) | |
Clean up after previous commit.
Diffstat (limited to 'test/ffmpeg_encoder_test.cc')
| -rw-r--r-- | test/ffmpeg_encoder_test.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc index 65ca59d34..d9dd0f383 100644 --- a/test/ffmpeg_encoder_test.cc +++ b/test/ffmpeg_encoder_test.cc @@ -28,7 +28,7 @@ #include "lib/ratio.h" #include "lib/transcode_job.h" #include "lib/dcp_content.h" -#include "lib/text_content.h" +#include "lib/caption_content.h" #include "lib/compose.hpp" #include "test.h" #include <boost/test/unit_test.hpp> @@ -124,9 +124,9 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test6) shared_ptr<TextCaptionFileContent> s (new TextCaptionFileContent (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)); - s->subtitle->set_effect (dcp::SHADOW); - s->subtitle->set_effect_colour (dcp::Colour (0, 255, 255)); + s->caption->set_colour (dcp::Colour (255, 255, 0)); + s->caption->set_effect (dcp::SHADOW); + s->caption->set_effect_colour (dcp::Colour (0, 255, 255)); film->write_metadata(); shared_ptr<Job> job (new TranscodeJob (film)); @@ -149,9 +149,9 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test7) shared_ptr<TextCaptionFileContent> s (new TextCaptionFileContent (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)); - s->subtitle->set_effect (dcp::SHADOW); - s->subtitle->set_effect_colour (dcp::Colour (0, 255, 255)); + s->caption->set_colour (dcp::Colour (255, 255, 0)); + s->caption->set_effect (dcp::SHADOW); + s->caption->set_effect_colour (dcp::Colour (0, 255, 255)); shared_ptr<Job> job (new TranscodeJob (film)); FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test7.mov", FFmpegEncoder::FORMAT_PRORES, false); @@ -175,9 +175,9 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test2) shared_ptr<TextCaptionFileContent> s (new TextCaptionFileContent (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)); - s->subtitle->set_effect (dcp::SHADOW); - s->subtitle->set_effect_colour (dcp::Colour (0, 255, 255)); + s->caption->set_colour (dcp::Colour (255, 255, 0)); + s->caption->set_effect (dcp::SHADOW); + s->caption->set_effect_colour (dcp::Colour (0, 255, 255)); film->write_metadata(); shared_ptr<Job> job (new TranscodeJob (film)); @@ -200,9 +200,9 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test3) shared_ptr<TextCaptionFileContent> s (new TextCaptionFileContent (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)); - s->subtitle->set_effect (dcp::SHADOW); - s->subtitle->set_effect_colour (dcp::Colour (0, 255, 255)); + s->caption->set_colour (dcp::Colour (255, 255, 0)); + s->caption->set_effect (dcp::SHADOW); + s->caption->set_effect_colour (dcp::Colour (0, 255, 255)); film->write_metadata(); shared_ptr<Job> job (new TranscodeJob (film)); |