shared_ptr<Film> film = new_test_film ("ffmpeg_audio_only_test");
film->set_name ("test_film");
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
- shared_ptr<FFmpegContent> c (new FFmpegContent (film, file));
+ shared_ptr<FFmpegContent> c (new FFmpegContent(file));
film->examine_and_add_content (c);
- wait_for_jobs ();
+ BOOST_REQUIRE (!wait_for_jobs());
film->write_metadata ();
/* See if can make a DCP without any errors */
film->make_dcp ();
- wait_for_jobs ();
+ BOOST_REQUIRE (!wait_for_jobs());
BOOST_CHECK (!JobManager::instance()->errors());
/* Compare the audio data player reads with what libsndfile reads */
shared_ptr<dcp::SoundAssetReader> reader = asset.start_read ();
for (int i = 0; i < asset.intrinsic_duration(); ++i) {
shared_ptr<const dcp::SoundFrame> frame = reader->get_frame(i);
- sf_count_t this_time = min (info.frames, 2000L);
+ sf_count_t this_time = min (info.frames, sf_count_t(2000));
sf_readf_short (ref, buffer, this_time);
for (int j = 0; j < this_time; ++j) {
BOOST_REQUIRE_EQUAL (frame->get(2, j) >> 8, buffer[j]);
shared_ptr<dcp::SoundAssetReader> reader = asset.start_read ();
for (int i = 0; i < asset.intrinsic_duration(); ++i) {
shared_ptr<const dcp::SoundFrame> frame = reader->get_frame(i);
- sf_count_t this_time = min (info.frames, 2000L);
+ sf_count_t this_time = min (info.frames, sf_count_t(2000));
sf_readf_int (ref, buffer, this_time);
for (int j = 0; j < this_time; ++j) {
int32_t s = frame->get(2, j);
shared_ptr<dcp::SoundAssetReader> reader = asset.start_read ();
for (int i = 0; i < asset.intrinsic_duration(); ++i) {
shared_ptr<const dcp::SoundFrame> frame = reader->get_frame(i);
- sf_count_t this_time = min (info.frames, 2000L);
+ sf_count_t this_time = min (info.frames, sf_count_t(2000));
sf_readf_int (ref, buffer, this_time);
for (int j = 0; j < this_time; ++j) {
int32_t s = frame->get(2, j);