diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-03 10:12:35 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-03 10:12:35 +0000 |
| commit | c008066160d85b9ec9e5485375d7baaa5d27bda2 (patch) | |
| tree | cf2876d69549119bf22761c5f6eccb568242b647 /test/player_test.cc | |
| parent | 996fa2194581bf95113b9778849654893c414889 (diff) | |
Hand-apply 6a3cd511559433554ab40ed72ff94b7d8dc2c5bd from master;
Basics of an image sequence dialog that asks about frame rate and
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 b6f864f82..d7a55b57a 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); - film->examine_and_add_content (B); - film->examine_and_add_content (C); + film->examine_and_add_content (A, true); + film->examine_and_add_content (B, true); + film->examine_and_add_content (C, true); 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); + film->examine_and_add_content (c, true); wait_for_jobs (); shared_ptr<Player> player = film->make_player (); |