diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-11-06 22:25:48 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-11-06 22:25:48 +0000 |
| commit | e5b744922fb6aed65ec13f22a9de0c86dd1bd561 (patch) | |
| tree | afdb5ca70f017a84e69a12deb328f2e758cb6166 /test | |
| parent | 24fbd3513614dba8f2e5ac16b86576d39f1dc6c0 (diff) | |
Remove some unused parameters.
Diffstat (limited to 'test')
| -rw-r--r-- | test/dcp_playback_test.cc | 2 | ||||
| -rw-r--r-- | test/player_test.cc | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc index 4307fb413..609971657 100644 --- a/test/dcp_playback_test.cc +++ b/test/dcp_playback_test.cc @@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test) } /* assuming DCP is 24fps/48kHz */ butler->get_audio (audio_buffer, 2000); - p.first->image(optional<dcp::NoteHandler>(), bind(&PlayerVideo::always_rgb, _1), false, true); + p.first->image(bind(&PlayerVideo::always_rgb, _1), false, true); } delete[] audio_buffer; } diff --git a/test/player_test.cc b/test/player_test.cc index 60b5debff..9351d3dd3 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -194,12 +194,6 @@ BOOST_AUTO_TEST_CASE (player_interleave_test) } } -static void -note_handler (dcp::NoteType, std::string) -{ - -} - /** Test some seeks towards the start of a DCP with awkward subtitles; see mantis #1085 * and a number of others. I thought this was a player seek bug but in fact it was * caused by the subtitle starting just after the start of the video frame and hence @@ -226,7 +220,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test) butler->seek (t, true); pair<shared_ptr<PlayerVideo>, DCPTime> video = butler->get_video(); BOOST_CHECK_EQUAL(video.second.get(), t.get()); - write_image(video.first->image(optional<dcp::NoteHandler>(note_handler), PlayerVideo::always_rgb, false, true), String::compose("build/test/player_seek_test_%1.png", i), "RGB"); + write_image(video.first->image(PlayerVideo::always_rgb, false, true), String::compose("build/test/player_seek_test_%1.png", i), "RGB"); /* This 0.011 is empirically chosen (hopefully) to accept changes in rendering between the reference and a test machine (17.10 and 16.04 seem to anti-alias a little differently) but to reject gross errors e.g. missing fonts or missing text altogether. @@ -259,7 +253,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test2) butler->seek (t, true); pair<shared_ptr<PlayerVideo>, DCPTime> video = butler->get_video(); BOOST_CHECK_EQUAL(video.second.get(), t.get()); - write_image(video.first->image(optional<dcp::NoteHandler>(note_handler), PlayerVideo::always_rgb, false, true), String::compose("build/test/player_seek_test2_%1.png", i), "RGB"); + write_image(video.first->image(PlayerVideo::always_rgb, false, true), String::compose("build/test/player_seek_test2_%1.png", i), "RGB"); check_image(String::compose("test/data/player_seek_test2_%1.png", i), String::compose("build/test/player_seek_test2_%1.png", i), 0.011); } } |