centralize computation of tempo from SMF information

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

diff --git a/libs/evoral/test/SMFTest.hpp b/libs/evoral/test/SMFTest.hpp
index 1dbceee6ab973742df441663d5408591a2ce6b69..fc58ede9353cd424ff4cf884a1c1775faa934b22 100644 (file)
--- a/libs/evoral/test/SMFTest.hpp
+++ b/libs/evoral/test/SMFTest.hpp
@@ -21,6 +21,7 @@
 #include <sigc++/sigc++.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
+#include "evoral/types.hpp"
 #include "evoral/SMF.hpp"
 #include "SequenceTest.hpp"
 
@@ -40,7 +41,8 @@ public:
        }
 
        int read_event(uint32_t* delta_t, uint32_t* size, uint8_t** buf) const {
-               return SMF::read_event(delta_t, size, buf);
+               event_id_t id;
+               return SMF::read_event(delta_t, size, buf, &id);
        }
 
 private:
@@ -52,10 +54,11 @@ class SMFTest : public CppUnit::TestFixture
        CPPUNIT_TEST_SUITE(SMFTest);
        CPPUNIT_TEST(createNewFileTest);
        CPPUNIT_TEST(takeFiveTest);
+       CPPUNIT_TEST(writeTest);
        CPPUNIT_TEST_SUITE_END();
 
 public:
-       typedef double Time;
+       typedef Evoral::Beats Time;
 
        void setUp() {
                type_map = new DummyTypeMap();
@@ -71,6 +74,7 @@ public:
 
        void createNewFileTest();
        void takeFiveTest();
+       void writeTest();
 
 private:
        DummyTypeMap*     type_map;