summaryrefslogtreecommitdiff
path: root/test/vf_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-02-26 01:40:30 +0000
committerCarl Hetherington <cth@carlh.net>2017-04-19 23:04:32 +0100
commit58dce923b9d438a27ce1cd7e3125370f74d46e3a (patch)
tree5a332a967aa3fb9bcb923f62b4832d8bb4d2bb17 /test/vf_test.cc
parente7e06b4c9a6bf4459ff27a30cf347121c0e40e07 (diff)
Fix merging of audio in various circumstances.
Diffstat (limited to 'test/vf_test.cc')
-rw-r--r--test/vf_test.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/vf_test.cc b/test/vf_test.cc
index f4f8fb2a6..539b2b9fa 100644
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -94,12 +94,14 @@ BOOST_AUTO_TEST_CASE (vf_test2)
ov->make_dcp ();
wait_for_jobs ();
+ std::cout << "incoming vf.\n";
+
/* Make the VF */
shared_ptr<Film> vf = new_test_film ("vf_test2_vf");
vf->set_name ("vf_test2_vf");
vf->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
- shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (content_factory (vf, ov->dir (ov->dcp_name ())).front());
+ shared_ptr<DCPContent> dcp (new DCPContent (vf, ov->dir (ov->dcp_name ())));
BOOST_REQUIRE (dcp);
vf->examine_and_add_content (dcp);
wait_for_jobs ();
@@ -156,7 +158,7 @@ BOOST_AUTO_TEST_CASE (vf_test3)
vf->set_name ("vf_test3_vf");
vf->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
- shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (content_factory(vf, ov->dir (ov->dcp_name ())).front());
+ shared_ptr<DCPContent> dcp (new DCPContent (vf, ov->dir (ov->dcp_name ())));
BOOST_REQUIRE (dcp);
dcp->set_trim_start (ContentTime::from_seconds (1));
dcp->set_trim_end (ContentTime::from_seconds (1));