projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix old merge artefact.
[dcpomatic.git]
/
test
/
import_dcp_test.cc
diff --git
a/test/import_dcp_test.cc
b/test/import_dcp_test.cc
index aa4049111c82229266fae87e64c2d7ba5e5ac84c..1f5247392a461b6dd90033b4189a7a18c2f02b7c 100644
(file)
--- a/
test/import_dcp_test.cc
+++ b/
test/import_dcp_test.cc
@@
-30,6
+30,8
@@
#include "lib/dcp_content_type.h"
#include "lib/dcp_content.h"
#include "lib/ffmpeg_content.h"
#include "lib/dcp_content_type.h"
#include "lib/dcp_content.h"
#include "lib/ffmpeg_content.h"
+#include "lib/examine_content_job.h"
+#include "lib/job_manager.h"
#include "lib/config.h"
#include "lib/cross.h"
#include <dcp/cpl.h>
#include "lib/config.h"
#include "lib/cross.h"
#include <dcp/cpl.h>
@@
-80,6
+82,7
@@
BOOST_AUTO_TEST_CASE (import_dcp_test)
B->examine_and_add_content (d);
BOOST_CHECK (!wait_for_jobs ());
d->add_kdm (kdm);
B->examine_and_add_content (d);
BOOST_CHECK (!wait_for_jobs ());
d->add_kdm (kdm);
+ JobManager::instance()->add (shared_ptr<Job> (new ExamineContentJob (B, d)));
BOOST_CHECK (!wait_for_jobs ());
B->make_dcp ();
BOOST_CHECK (!wait_for_jobs ());
B->make_dcp ();