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/torture_test.cc | |
| parent | c31b9542c58ae1cbfae7ec3ba4911359fd010ba2 (diff) | |
Take Film pointer out of Content.
Diffstat (limited to 'test/torture_test.cc')
| -rw-r--r-- | test/torture_test.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/torture_test.cc b/test/torture_test.cc index 3736b3e65..b6079096d 100644 --- a/test/torture_test.cc +++ b/test/torture_test.cc @@ -56,28 +56,28 @@ BOOST_AUTO_TEST_CASE (torture_test1) film->set_sequence (false); /* Staircase at an offset of 2000 samples, trimmed both start and end, with a gain of 6dB */ - shared_ptr<Content> staircase = content_factory(film, "test/data/staircase.wav").front (); + shared_ptr<Content> staircase = content_factory("test/data/staircase.wav").front (); film->examine_and_add_content (staircase); wait_for_jobs (); - staircase->set_position (DCPTime::from_frames (2000, film->audio_frame_rate())); + staircase->set_position (film, DCPTime::from_frames (2000, film->audio_frame_rate())); staircase->set_trim_start (ContentTime::from_frames (12, 48000)); staircase->set_trim_end (ContentTime::from_frames (35, 48000)); staircase->audio->set_gain (20 * log10(2)); /* And again at an offset of 50000 samples, trimmed both start and end, with a gain of 6dB */ - staircase = content_factory(film, "test/data/staircase.wav").front (); + staircase = content_factory("test/data/staircase.wav").front (); film->examine_and_add_content (staircase); wait_for_jobs (); - staircase->set_position (DCPTime::from_frames (50000, film->audio_frame_rate())); + staircase->set_position (film, DCPTime::from_frames(50000, film->audio_frame_rate())); staircase->set_trim_start (ContentTime::from_frames (12, 48000)); staircase->set_trim_end (ContentTime::from_frames (35, 48000)); staircase->audio->set_gain (20 * log10(2)); /* 1s of red at 5s in */ - shared_ptr<Content> red = content_factory(film, "test/data/flat_red.png").front (); + shared_ptr<Content> red = content_factory("test/data/flat_red.png").front (); film->examine_and_add_content (red); wait_for_jobs (); - red->set_position (DCPTime::from_seconds (5)); + red->set_position (film, DCPTime::from_seconds(5)); red->video->set_length (24); film->set_video_frame_rate (24); |