projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
swaroop: write position file every 2 minutes; tweak play sensitivity
[dcpomatic.git]
/
test
/
ssa_subtitle_test.cc
diff --git
a/test/ssa_subtitle_test.cc
b/test/ssa_subtitle_test.cc
index 57813b944bf8d9c7370dcbfd577382802d6cbaea..c61d34b7149f2c7cbd44054fd87b62752ed1345c 100644
(file)
--- a/
test/ssa_subtitle_test.cc
+++ b/
test/ssa_subtitle_test.cc
@@
-24,11
+24,11
@@
*/
#include "lib/film.h"
*/
#include "lib/film.h"
-#include "lib/
text_caption
_file_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"
-#include "lib/
caption
_content.h"
+#include "lib/
text
_content.h"
#include "test.h"
#include <boost/test/unit_test.hpp>
#include <boost/algorithm/string.hpp>
#include "test.h"
#include <boost/test/unit_test.hpp>
#include <boost/algorithm/string.hpp>
@@
-47,15
+47,15
@@
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<
TextCaptionFileContent> content (new TextCaptionFileContent (film,
private_data / "DKH_UT_EN20160601def.ssa"));
+ shared_ptr<
StringTextFileContent> content (new StringTextFileContent(
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->only_
caption
()->set_use (true);
- content->only_
caption
()->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;
/* Find the subtitle file and check it */
list<string> ignore;