projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reword again: Text -> Caption and Plain -> Text.
[dcpomatic.git]
/
test
/
ffmpeg_encoder_test.cc
diff --git
a/test/ffmpeg_encoder_test.cc
b/test/ffmpeg_encoder_test.cc
index e579621c69eaa81869833579affaa31b41ee451a..65ca59d349b63cc4204f4bc8ef1e6d020446d0df 100644
(file)
--- 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/image_content.h"
#include "lib/video_content.h"
#include "lib/audio_content.h"
-#include "lib/
plain_text
_content.h"
+#include "lib/
text_caption_file
_content.h"
#include "lib/ratio.h"
#include "lib/transcode_job.h"
#include "lib/dcp_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);
film->set_container (Ratio::from_id ("185"));
film->set_audio_channels (6);
- shared_ptr<
PlainTextContent> s (new PlainText
Content (film, "test/data/subrip2.srt"));
+ shared_ptr<
TextCaptionFileContent> s (new TextCaptionFile
Content (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));
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 ());
film->examine_and_add_content (c);
BOOST_REQUIRE (!wait_for_jobs ());
- shared_ptr<
PlainTextContent> s (new PlainText
Content (film, "test/data/subrip.srt"));
+ shared_ptr<
TextCaptionFileContent> s (new TextCaptionFile
Content (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));
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);
film->set_container (Ratio::from_id ("185"));
film->set_audio_channels (6);
- shared_ptr<
PlainTextContent> s (new PlainText
Content (film, "test/data/subrip2.srt"));
+ shared_ptr<
TextCaptionFileContent> s (new TextCaptionFile
Content (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));
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 ());
film->examine_and_add_content (c);
BOOST_REQUIRE (!wait_for_jobs ());
- shared_ptr<
PlainTextContent> s (new PlainText
Content (film, "test/data/subrip.srt"));
+ shared_ptr<
TextCaptionFileContent> s (new TextCaptionFile
Content (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));
film->examine_and_add_content (s);
BOOST_REQUIRE (!wait_for_jobs ());
s->subtitle->set_colour (dcp::Colour (255, 255, 0));