diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-25 11:58:12 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-25 13:36:17 +0100 |
| commit | 89ee4cc6019036fa4fc0a6e07e052ffdc3b136ac (patch) | |
| tree | 5a1d1b3e1e6fc4d280f1ff0f1598a37e0fea3257 /test/srt_subtitle_test.cc | |
| parent | e08c1d30bb5e2d77339541eb7dbe7d1ca95485ab (diff) | |
Make player decide whether subtitles should be burnt based on
content settings rather than using the film's settings. Remove
film property of burn-subtitles.
Diffstat (limited to 'test/srt_subtitle_test.cc')
| -rw-r--r-- | test/srt_subtitle_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc index 64249a118..161d23d77 100644 --- a/test/srt_subtitle_test.cc +++ b/test/srt_subtitle_test.cc @@ -37,12 +37,12 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test) film->set_container (Ratio::from_id ("185")); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); film->set_name ("frobozz"); - film->set_burn_subtitles (false); shared_ptr<SubRipContent> content (new SubRipContent (film, "test/data/subrip2.srt")); film->examine_and_add_content (content); wait_for_jobs (); content->set_use_subtitles (true); + content->set_burn_subtitles (false); film->make_dcp (); wait_for_jobs (); @@ -57,12 +57,12 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test2) film->set_container (Ratio::from_id ("185")); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); film->set_name ("frobozz"); - film->set_burn_subtitles (false); shared_ptr<SubRipContent> content (new SubRipContent (film, "test/data/subrip2.srt")); film->examine_and_add_content (content); wait_for_jobs (); content->set_use_subtitles (true); + content->set_burn_subtitles (false); /* Use test/data/subrip2.srt as if it were a font file */ content->fonts().front()->set_file ("test/data/subrip2.srt"); |