* introduced dependency: libsmf-1.2

* extracted Interface from SMF: StandardMIDIFile
* first implementation of StandardMIDIFile based on libsmf that passes basic test


git-svn-id: svn://localhost/ardour2/branches/3.0@4529 d708f5d6-7413-0410-9779-e7cbd77b26cf

2 files changed, 5 insertions, 5 deletions

diff --git a/libs/evoral/test/SMFTest.cpp b/libs/evoral/test/SMFTest.cpp
index b5891ff23f..49233101cb 100644
--- a/libs/evoral/test/SMFTest.cpp
+++ b/libs/evoral/test/SMFTest.cpp
@@ -24,11 +24,11 @@ SMFTest::takeFiveTest ()
 	uint8_t* buf     = NULL;
 	int ret;
 	while ((ret = smf.read_event(&delta_t, &size, &buf)) >= 0) {
-		cerr << "read smf event type " << int(buf[0]) << endl;
 		ev.set(buf, size, 0.0);
 		time += delta_t;
 		
 		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_event_type(type_map->midi_event_type(buf[0]));
diff --git a/libs/evoral/test/SMFTest.hpp b/libs/evoral/test/SMFTest.hpp
index f63fec838a..99c3288f5a 100644
--- a/libs/evoral/test/SMFTest.hpp
+++ b/libs/evoral/test/SMFTest.hpp
@@ -1,7 +1,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <evoral/SMF.hpp>
+#include <evoral/LibSMF.hpp>
 
 #include "SequenceTest.hpp"
 
@@ -12,14 +12,14 @@
 using namespace Evoral;
 
 template<typename Time>
-class TestSMF : public SMF<Time> {
+class TestSMF : public LibSMF<Time> {
 public:
 	int  open(const std::string& path) {
-		return SMF<Time>::open(path);
+		return LibSMF<Time>::open(path);
 	}
 	
 	int read_event(uint32_t* delta_t, uint32_t* size, uint8_t** buf) const {
-		return SMF<Time>::read_event(delta_t, size, buf);
+		return LibSMF<Time>::read_event(delta_t, size, buf);
 	}
 };