merge with master

[ardour.git] / libs / evoral / test / SMFTest.cpp

diff --git a/libs/evoral/test/SMFTest.cpp b/libs/evoral/test/SMFTest.cpp
index b57f89e8719032e613ececbb95f4936dad578c4f..fe9efa479f49731aa58c14730e5019ac35026e4a 100644 (file)
--- a/libs/evoral/test/SMFTest.cpp
+++ b/libs/evoral/test/SMFTest.cpp
@@ -1,5 +1,9 @@
 #include "SMFTest.hpp"
 
+#ifdef WIN32
+#include <io.h> // for R_OK
+#endif
+
 using namespace std;
 
 CPPUNIT_TEST_SUITE_REGISTRATION( SMFTest );
@@ -40,7 +44,7 @@ SMFTest::takeFiveTest ()
                if (ret > 0) { // didn't skip (meta) event
                        //cerr << "read smf event type " << hex << int(buf[0]) << endl;
                        // make ev.time absolute time in frames
-                       ev.time() = time * frames_per_beat / (double)smf.ppqn();
+                       ev.set_time(time * frames_per_beat / (double)smf.ppqn());
                        ev.set_event_type(type_map->midi_event_type(buf[0]));
                        seq->append(ev, next_event_id ());
                }