diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-11-30 23:49:04 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-12-01 00:20:51 +0100 |
| commit | 5b6b01ea778064a0b0125ea8ebd9272a534cccd2 (patch) | |
| tree | b9fcb7a7336240e700686c256b6aa29d8b7f7fa7 /test | |
| parent | d1a57244622f5f4160d0f58af7fe71a829175345 (diff) | |
Give Butler a weak_ptr<Film>
Diffstat (limited to 'test')
| -rw-r--r-- | test/butler_test.cc | 2 | ||||
| -rw-r--r-- | test/dcp_playback_test.cc | 1 | ||||
| -rw-r--r-- | test/player_test.cc | 6 |
3 files changed, 5 insertions, 4 deletions
diff --git a/test/butler_test.cc b/test/butler_test.cc index 8e3e7222f..9340ebe75 100644 --- a/test/butler_test.cc +++ b/test/butler_test.cc @@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE (butler_test1) map.set (i, i, 1); } - Butler butler (shared_ptr<Player>(new Player(film)), map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VIDEO_RANGE_FULL, false, false); + Butler butler (film, shared_ptr<Player>(new Player(film)), map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VIDEO_RANGE_FULL, false, false); BOOST_CHECK (butler.get_video(true, 0).second == DCPTime()); BOOST_CHECK (butler.get_video(true, 0).second == DCPTime::from_frames(1, 24)); diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc index a2cf37866..05554f4ed 100644 --- a/test/dcp_playback_test.cc +++ b/test/dcp_playback_test.cc @@ -43,6 +43,7 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test) shared_ptr<Butler> butler ( new Butler( + film, shared_ptr<Player>(new Player(film)), AudioMapping(6, 6), 6, diff --git a/test/player_test.cc b/test/player_test.cc index 15fb4161d..b5f082e74 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -218,7 +218,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test) player->set_always_burn_open_subtitles (); player->set_play_referenced (); - shared_ptr<Butler> butler (new Butler (player, AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VIDEO_RANGE_FULL, false, true)); + shared_ptr<Butler> butler (new Butler (film, player, AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VIDEO_RANGE_FULL, false, true)); butler->disable_audio(); for (int i = 0; i < 10; ++i) { @@ -249,7 +249,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test2) player->set_always_burn_open_subtitles (); player->set_play_referenced (); - shared_ptr<Butler> butler (new Butler(player, AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VIDEO_RANGE_FULL, false, true)); + shared_ptr<Butler> butler (new Butler(film, player, AudioMapping(), 2, bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VIDEO_RANGE_FULL, false, true)); butler->disable_audio(); butler->seek(DCPTime::from_seconds(5), true); @@ -336,7 +336,7 @@ BOOST_AUTO_TEST_CASE (player_trim_crash) shared_ptr<Player> player (new Player(film)); player->set_fast (); - shared_ptr<Butler> butler (new Butler(player, AudioMapping(), 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VIDEO_RANGE_FULL, false, true)); + shared_ptr<Butler> butler (new Butler(film, player, AudioMapping(), 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VIDEO_RANGE_FULL, false, true)); /* Wait for the butler to fill */ dcpomatic_sleep_seconds (5); |