summaryrefslogtreecommitdiff
path: root/test/threed_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-11-21 01:59:04 +0000
committerCarl Hetherington <cth@carlh.net>2018-11-21 01:59:04 +0000
commit254b3044d72de6b033d7c584f5abd2b9aa70aad5 (patch)
tree8a5c83c1b2dea690672663dedb2f3aa50f4473dc /test/threed_test.cc
parentc31b9542c58ae1cbfae7ec3ba4911359fd010ba2 (diff)
Take Film pointer out of Content.
Diffstat (limited to 'test/threed_test.cc')
-rw-r--r--test/threed_test.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/test/threed_test.cc b/test/threed_test.cc
index 41d92bc2f..a8d3f8a00 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -40,7 +40,7 @@ BOOST_AUTO_TEST_CASE (threed_test1)
{
shared_ptr<Film> film = new_test_film ("threed_test1");
film->set_name ("test_film1");
- shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
+ shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
film->examine_and_add_content (c);
wait_for_jobs ();
@@ -63,7 +63,7 @@ BOOST_AUTO_TEST_CASE (threed_test2)
{
shared_ptr<Film> film = new_test_film ("threed_test2");
film->set_name ("test_film2");
- shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
+ shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
film->examine_and_add_content (c);
wait_for_jobs ();
@@ -85,9 +85,9 @@ BOOST_AUTO_TEST_CASE (threed_test2)
BOOST_AUTO_TEST_CASE (threed_test3)
{
shared_ptr<Film> film = new_test_film2 ("threed_test3");
- shared_ptr<FFmpegContent> L (new FFmpegContent (film, "test/data/test.mp4"));
+ shared_ptr<FFmpegContent> L (new FFmpegContent("test/data/test.mp4"));
film->examine_and_add_content (L);
- shared_ptr<FFmpegContent> R (new FFmpegContent (film, "test/data/test.mp4"));
+ shared_ptr<FFmpegContent> R (new FFmpegContent("test/data/test.mp4"));
film->examine_and_add_content (R);
wait_for_jobs ();
@@ -104,9 +104,9 @@ BOOST_AUTO_TEST_CASE (threed_test3)
BOOST_AUTO_TEST_CASE (threed_test4)
{
shared_ptr<Film> film = new_test_film2 ("threed_test4");
- shared_ptr<FFmpegContent> L (new FFmpegContent (film, private_data / "LEFT_TEST_DCP3D4K.mov"));
+ shared_ptr<FFmpegContent> L (new FFmpegContent(private_data / "LEFT_TEST_DCP3D4K.mov"));
film->examine_and_add_content (L);
- shared_ptr<FFmpegContent> R (new FFmpegContent (film, private_data / "RIGHT_TEST_DCP3D4K.mov"));
+ shared_ptr<FFmpegContent> R (new FFmpegContent(private_data / "RIGHT_TEST_DCP3D4K.mov"));
film->examine_and_add_content (R);
wait_for_jobs ();
@@ -123,9 +123,9 @@ BOOST_AUTO_TEST_CASE (threed_test4)
BOOST_AUTO_TEST_CASE (threed_test5)
{
shared_ptr<Film> film = new_test_film2 ("threed_test5");
- shared_ptr<FFmpegContent> L (new FFmpegContent (film, private_data / "boon_telly.mkv"));
+ shared_ptr<FFmpegContent> L (new FFmpegContent(private_data / "boon_telly.mkv"));
film->examine_and_add_content (L);
- shared_ptr<FFmpegContent> R (new FFmpegContent (film, private_data / "boon_telly.mkv"));
+ shared_ptr<FFmpegContent> R (new FFmpegContent(private_data / "boon_telly.mkv"));
film->examine_and_add_content (R);
wait_for_jobs ();