diff options
| author | David Robillard <d@drobilla.net> | 2009-02-15 01:32:41 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-02-15 01:32:41 +0000 |
| commit | 5d519f8bb1a17f316f2bc25cc96a52d26b115c94 (patch) | |
| tree | 101e64c26bbe7ccda6ba20c7a36e0cc508de88ca /libs/evoral/test | |
| parent | 5a48f99f72c2e2f3ed313e00446dfdaa05dc5d56 (diff) | |
De-templatify Evoral::SMF which has no concept of time other than SMF time.
git-svn-id: svn://localhost/ardour2/branches/3.0@4571 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/evoral/test')
| -rw-r--r-- | libs/evoral/test/SMFTest.cpp | 4 | ||||
| -rw-r--r-- | libs/evoral/test/SMFTest.hpp | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/libs/evoral/test/SMFTest.cpp b/libs/evoral/test/SMFTest.cpp index 5a199a3bbd..2a299be1f3 100644 --- a/libs/evoral/test/SMFTest.cpp +++ b/libs/evoral/test/SMFTest.cpp @@ -7,7 +7,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION( SMFTest ); void SMFTest::createNewFileTest () { - TestSMF<Time> smf; + TestSMF smf; smf.create("NewFile.mid"); smf.close(); CPPUNIT_ASSERT(access("NewFile.mid", R_OK) == 0); @@ -17,7 +17,7 @@ SMFTest::createNewFileTest () void SMFTest::takeFiveTest () { - TestSMF<Time> smf; + TestSMF smf; smf.open("./test/testdata/TakeFive.mid"); CPPUNIT_ASSERT(!smf.is_empty()); diff --git a/libs/evoral/test/SMFTest.hpp b/libs/evoral/test/SMFTest.hpp index 0f2fcf89fb..08f51b2a51 100644 --- a/libs/evoral/test/SMFTest.hpp +++ b/libs/evoral/test/SMFTest.hpp @@ -25,22 +25,21 @@ using namespace Evoral; -template<typename Time> -class TestSMF : public SMF<Time> { +class TestSMF : public SMF { public: std::string path() const { return _path; } int open(const std::string& path) THROW_FILE_ERROR { _path = path; - return SMF<Time>::open(path); + return SMF::open(path); } void close() THROW_FILE_ERROR { - return SMF<Time>::close(); + return SMF::close(); } int read_event(uint32_t* delta_t, uint32_t* size, uint8_t** buf) const { - return SMF<Time>::read_event(delta_t, size, buf); + return SMF::read_event(delta_t, size, buf); } private: |