diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-31 18:58:24 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-31 18:58:24 +0100 |
| commit | d02f1b0f08b3095816767ab7a70254aef50eb355 (patch) | |
| tree | 26811832c7b89e59a75710e434eae33557f96303 /test | |
| parent | 8b2d460f1b76d3d1122cfdb2a6a33e6eab7cece4 (diff) | |
Various fixes to audio play wrt trimming and push/pull merger API.
Diffstat (limited to 'test')
| -rw-r--r-- | test/ffmpeg_audio_test.cc | 1 | ||||
| -rw-r--r-- | test/test.cc | 6 | ||||
| -rw-r--r-- | test/wscript | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc index 19f71e964..7eafeef70 100644 --- a/test/ffmpeg_audio_test.cc +++ b/test/ffmpeg_audio_test.cc @@ -44,6 +44,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test) wait_for_jobs (); film->set_container (Ratio::from_id ("185")); + film->set_audio_channels (6); film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test")); film->make_dcp (); film->write_metadata (); diff --git a/test/test.cc b/test/test.cc index 1fd79872f..2334523a1 100644 --- a/test/test.cc +++ b/test/test.cc @@ -144,8 +144,10 @@ wait_for_jobs () while (jm->work_to_do ()) {} if (jm->errors ()) { for (list<shared_ptr<Job> >::iterator i = jm->_jobs.begin(); i != jm->_jobs.end(); ++i) { - cerr << (*i)->error_summary () << "\n" - << (*i)->error_details () << "\n"; + if ((*i)->finished_in_error ()) { + cerr << (*i)->error_summary () << "\n" + << (*i)->error_details () << "\n"; + } } } diff --git a/test/wscript b/test/wscript index 0fcb185f8..8cc50a683 100644 --- a/test/wscript +++ b/test/wscript @@ -16,6 +16,7 @@ def build(bld): obj.use = 'libdcpomatic' obj.source = """ test.cc + audio_delay_test.cc silence_padding_test.cc audio_merger_test.cc resampler_test.cc @@ -23,7 +24,6 @@ def build(bld): threed_test.cc play_test.cc frame_rate_test.cc - audio_delay_test.cc ffmpeg_pts_offset.cc ffmpeg_examiner_test.cc black_fill_test.cc |