X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Faudio_merger_test.cc;h=336dfcdf38e5d58a87d47e1252154065f284ace1;hb=8987f133295e352c44e05ef338eacc801c61a629;hp=4472f02c152327337232a61fad1fa67aa0724df1;hpb=3339d3bce70afe9ae2ca10e9fcfc4b54b748fbf4;p=dcpomatic.git diff --git a/test/audio_merger_test.cc b/test/audio_merger_test.cc index 4472f02c1..336dfcdf3 100644 --- a/test/audio_merger_test.cc +++ b/test/audio_merger_test.cc @@ -30,10 +30,10 @@ #include "lib/audio_buffers.h" #include "lib/dcpomatic_time.h" #include "test.h" +#include #include #include #include -#include #include #include @@ -155,11 +155,11 @@ BOOST_AUTO_TEST_CASE (audio_merger_test3) /* Reply a sequence of calls to AudioMerger that resulted in a crash */ BOOST_AUTO_TEST_CASE (audio_merger_test4) { - auto f = fopen_boost("test/data/audio_merger_bug1.log", "r"); + dcp::File f("test/data/audio_merger_bug1.log", "r"); BOOST_REQUIRE (f); list tokens; char buf[64]; - while (fscanf(f, "%63s", buf) == 1) { + while (fscanf(f.get(), "%63s", buf) == 1) { tokens.push_back (buf); }