projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix deadlock in test.
[dcpomatic.git]
/
test
/
dcp_subtitle_test.cc
diff --git
a/test/dcp_subtitle_test.cc
b/test/dcp_subtitle_test.cc
index 89eb11a6056b724ed4b232d4c643f30c8b1b03bc..4b3d8fc971076b80b30c0b553813b6af893794c3 100644
(file)
--- a/
test/dcp_subtitle_test.cc
+++ b/
test/dcp_subtitle_test.cc
@@
-42,6
+42,7
@@
using std::cout;
using std::list;
using boost::shared_ptr;
using boost::optional;
using std::list;
using boost::shared_ptr;
using boost::optional;
+using namespace dcpomatic;
optional<ContentStringText> stored;
optional<ContentStringText> stored;
@@
-90,7
+91,7
@@
BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test)
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
- shared_ptr<DCPDecoder> decoder (new DCPDecoder (film, content, false));
+ shared_ptr<DCPDecoder> decoder (new DCPDecoder (film, content, false
, false, shared_ptr<DCPDecoder>()
));
decoder->only_text()->PlainStart.connect (bind (store, _1));
stored = optional<ContentStringText> ();
decoder->only_text()->PlainStart.connect (bind (store, _1));
stored = optional<ContentStringText> ();