projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve layout of drive-wipe warning dialogue.
[dcpomatic.git]
/
test
/
ssa_subtitle_test.cc
diff --git
a/test/ssa_subtitle_test.cc
b/test/ssa_subtitle_test.cc
index 7e2233cca9fc83d3e4f92495309d42f4c6a5e92f..a7b27e2f30c8f19e1e4f332802e5e1634ee5a5eb 100644
(file)
--- a/
test/ssa_subtitle_test.cc
+++ b/
test/ssa_subtitle_test.cc
@@
-24,7
+24,7
@@
*/
#include "lib/film.h"
*/
#include "lib/film.h"
-#include "lib/
plain_text
_content.h"
+#include "lib/
string_text_file
_content.h"
#include "lib/dcp_content_type.h"
#include "lib/font.h"
#include "lib/ratio.h"
#include "lib/dcp_content_type.h"
#include "lib/font.h"
#include "lib/ratio.h"
@@
-47,18
+47,18
@@
BOOST_AUTO_TEST_CASE (ssa_subtitle_test1)
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
film->set_name ("frobozz");
film->set_interop (true);
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
film->set_name ("frobozz");
film->set_interop (true);
- shared_ptr<
PlainText> content (new PlainText (film,
private_data / "DKH_UT_EN20160601def.ssa"));
+ shared_ptr<
StringTextFileContent> content (new StringTextFileContent(TestPaths::
private_data / "DKH_UT_EN20160601def.ssa"));
film->examine_and_add_content (content);
film->examine_and_add_content (content);
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
- content->
subtitle
->set_use (true);
- content->
subtitle
->set_burn (false);
+ content->
only_text()
->set_use (true);
+ content->
only_text()
->set_burn (false);
film->make_dcp ();
film->make_dcp ();
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
/* Find the subtitle file and check it */
list<string> ignore;
ignore.push_back ("SubtitleID");
/* Find the subtitle file and check it */
list<string> ignore;
ignore.push_back ("SubtitleID");
- check_xml (subtitle_file(film), private_data / "DKH_UT_EN20160601def.xml", ignore);
+ check_xml (subtitle_file(film),
TestPaths::
private_data / "DKH_UT_EN20160601def.xml", ignore);
}
}