diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-11-21 01:59:04 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-11-21 01:59:04 +0000 |
| commit | 254b3044d72de6b033d7c584f5abd2b9aa70aad5 (patch) | |
| tree | 8a5c83c1b2dea690672663dedb2f3aa50f4473dc /test/file_naming_test.cc | |
| parent | c31b9542c58ae1cbfae7ec3ba4911359fd010ba2 (diff) | |
Take Film pointer out of Content.
Diffstat (limited to 'test/file_naming_test.cc')
| -rw-r--r-- | test/file_naming_test.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/file_naming_test.cc b/test/file_naming_test.cc index bd7efb0d9..f06fdfa42 100644 --- a/test/file_naming_test.cc +++ b/test/file_naming_test.cc @@ -59,11 +59,11 @@ BOOST_AUTO_TEST_CASE (file_naming_test) shared_ptr<Film> film = new_test_film ("file_naming_test"); film->set_name ("file_naming_test"); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); - shared_ptr<FFmpegContent> r (new FFmpegContent (film, "test/data/flat_red.png")); + shared_ptr<FFmpegContent> r (new FFmpegContent("test/data/flat_red.png")); film->examine_and_add_content (r); - shared_ptr<FFmpegContent> g (new FFmpegContent (film, "test/data/flat_green.png")); + shared_ptr<FFmpegContent> g (new FFmpegContent("test/data/flat_green.png")); film->examine_and_add_content (g); - shared_ptr<FFmpegContent> b (new FFmpegContent (film, "test/data/flat_blue.png")); + shared_ptr<FFmpegContent> b (new FFmpegContent("test/data/flat_blue.png")); film->examine_and_add_content (b); wait_for_jobs (); @@ -98,11 +98,11 @@ BOOST_AUTO_TEST_CASE (file_naming_test2) shared_ptr<Film> film = new_test_film ("file_naming_test2"); film->set_name ("file_naming_test2"); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); - shared_ptr<FFmpegContent> r (new FFmpegContent (film, "test/data/flät_red.png")); + shared_ptr<FFmpegContent> r (new FFmpegContent("test/data/flät_red.png")); film->examine_and_add_content (r); - shared_ptr<FFmpegContent> g (new FFmpegContent (film, "test/data/flat_green.png")); + shared_ptr<FFmpegContent> g (new FFmpegContent("test/data/flat_green.png")); film->examine_and_add_content (g); - shared_ptr<FFmpegContent> b (new FFmpegContent (film, "test/data/flat_blue.png")); + shared_ptr<FFmpegContent> b (new FFmpegContent("test/data/flat_blue.png")); film->examine_and_add_content (b); wait_for_jobs (); |