Supporters update.

[dcpomatic.git] / test / audio_merger_test.cc

diff --git a/test/audio_merger_test.cc b/test/audio_merger_test.cc
index 3a677bf820d034323761e322dc6e741481bbe5b2..0138475bd60f1957b53d5275662905fcbc56c22f 100644 (file)
--- a/test/audio_merger_test.cc
+++ b/test/audio_merger_test.cc
@@ -30,6 +30,7 @@
 #include "lib/audio_buffers.h"
 #include "lib/dcpomatic_time.h"
 #include "test.h"
+#include <dcp/file.h>
 #include <dcp/raw_convert.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/bind/bind.hpp>
@@ -154,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<string> tokens;
        char buf[64];
-       while (fscanf(f, "%63s", buf) == 1) {
+       while (fscanf(f.get(), "%63s", buf) == 1) {
                tokens.push_back (buf);
        }
 
@@ -171,6 +172,7 @@ BOOST_AUTO_TEST_CASE (audio_merger_test4)
                        BOOST_REQUIRE (i != tokens.end());
                        merger.reset (new AudioMerger(dcp::raw_convert<int>(*i++)));
                } else if (cmd == "clear") {
+                       BOOST_REQUIRE(merger);
                        merger->clear ();
                } else if (cmd == "push") {
                        BOOST_REQUIRE (i != tokens.end());