diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-24 17:41:00 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-24 17:41:00 +0000 |
| commit | 59e769023c392c332331567a1aea94660002c463 (patch) | |
| tree | e68d918e3c48f470a688b8bb5bf95590fb9c4916 /test/player_test.cc | |
| parent | 5af65f61bf6eba06c24025d63b43aec896a00c9c (diff) | |
Hand-apply bbfb370d7de28ec1e8f307865cc6253bb5d4366e from master; quicker digest calculation.
Diffstat (limited to 'test/player_test.cc')
| -rw-r--r-- | test/player_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/player_test.cc b/test/player_test.cc index d7a55b57a..b6f864f82 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -44,9 +44,9 @@ BOOST_AUTO_TEST_CASE (player_overlaps_test) shared_ptr<FFmpegContent> B (new FFmpegContent (film, "test/data/test.mp4")); shared_ptr<FFmpegContent> C (new FFmpegContent (film, "test/data/test.mp4")); - film->examine_and_add_content (A, true); - film->examine_and_add_content (B, true); - film->examine_and_add_content (C, true); + film->examine_and_add_content (A); + film->examine_and_add_content (B); + film->examine_and_add_content (C); wait_for_jobs (); BOOST_CHECK_EQUAL (A->full_length(), DCPTime (288000)); @@ -87,7 +87,7 @@ BOOST_AUTO_TEST_CASE (player_silence_padding_test) film->set_container (Ratio::from_id ("185")); film->set_audio_channels (6); - film->examine_and_add_content (c, true); + film->examine_and_add_content (c); wait_for_jobs (); shared_ptr<Player> player = film->make_player (); |