* Evoral: first successful read from Sequence

*Evoral: added debug option to wscript


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

libs/evoral/test/sequence.cpp

@@ -3,15 +3,56 @@
 
 CPPUNIT_TEST_SUITE_REGISTRATION( SequenceTest );
 
+using namespace std;
+
 void 
 SequenceTest::createTest (void)
 {
-       	DummyTypeMap type_map;
+       	CPPUNIT_ASSERT_EQUAL(size_t(0), seq->sysexes().size());
-       	MySequence<double> seq(type_map, 100);
+       	CPPUNIT_ASSERT_EQUAL(size_t(0), seq->notes().size());
-
+       	CPPUNIT_ASSERT(seq->notes().begin() == seq->notes().end());
-       	CPPUNIT_ASSERT_EQUAL(size_t(0), seq.sysexes().size());
-       	CPPUNIT_ASSERT_EQUAL(size_t(100), seq.notes().size());
-       	CPPUNIT_ASSERT(seq.notes().begin() != seq.notes().end());
 }
 
+void 
+SequenceTest::preserveEventOrderingTest (void)
+{
+	vector<boost::shared_ptr<Event<Time> > > inserted_events;
+	
+	seq->start_write();
+	
+	for (Notes::const_iterator i = test_notes.begin(); i != test_notes.end(); ++i) {
+		uint8_t buffer[2];
+		Event<Time>* event = new Event<Time>(
+				DummyTypeMap::CONTROL, (*i)->on_event().time(), 2, buffer, true
+		);
+		
+		event->buffer()[0] = MIDI_CMD_CONTROL;
+		event->buffer()[1] = event->time() / 100;
+		
+		boost::shared_ptr<Event<Time> > event_ptr(event);
 
+		seq->append((*i)->on_event());
+		inserted_events.push_back(
+				boost::shared_ptr<Event<Time> >(
+						new Event<Time>((*i)->on_event(), true)
+		));
+		
+		seq->append(*event_ptr);
+		inserted_events.push_back(event_ptr);
+		
+		seq->append((*i)->off_event());
+		inserted_events.push_back(
+				boost::shared_ptr<Event<Time> >(
+						new Event<Time>((*i)->off_event(), true)
+		));
+	}
+	
+	seq->end_write();
+
+	TestSink<Time> sink;
+
+	seq->read(sink, timestamp_t(0), timedur_t(1200), timestamp_t(0));
+	
+	CPPUNIT_ASSERT_EQUAL(size_t(12), test_notes.size());
+	
+}

libs/evoral/test/sequence.hpp

@@ -3,46 +3,121 @@
 
 #include <evoral/Sequence.hpp>
 #include <evoral/TypeMap.hpp>
+#include <evoral/EventSink.hpp>
+#include <evoral/midi_events.h>
+#include <evoral/Control.hpp>
+
+#include <sigc++/sigc++.h>
+
+#include <cassert>
 
 
 using namespace Evoral;
 
 class DummyTypeMap : public TypeMap {
 public:
-	virtual ~DummyTypeMap() {}
-
-	virtual bool type_is_midi(uint32_t type) const {return true;}
-
-	virtual uint8_t parameter_midi_type(const Parameter& param) const {return 0;}
 	
-	virtual uint32_t midi_event_type(uint8_t status) const {return 0;}
+	enum DummyEventType {
+		NOTE,
+		CONTROL,
+		SYSEX
+	};
 	
-	virtual bool is_integer(const Evoral::Parameter& param) const {return true;}
+	~DummyTypeMap() {}
 
-	virtual Parameter new_parameter(uint32_t type, uint8_t channel, uint32_t id) const {return Parameter(type, channel, id);}
+	bool type_is_midi(uint32_t type) const {return true;}
 
-	virtual std::string to_symbol(const Parameter& param) const {return "foo";}
+	uint8_t parameter_midi_type(const Parameter& param) const {
+		switch (param.type()) {
+		case CONTROL:		return MIDI_CMD_CONTROL;
+		case SYSEX:			return MIDI_CMD_COMMON_SYSEX;
+		default:			return 0;
+		};		
+	}
+	
+	uint32_t midi_event_type(uint8_t status) const {
+		status &= 0xf0;
+		switch (status) {
+		case MIDI_CMD_CONTROL:			return CONTROL;
+		case MIDI_CMD_COMMON_SYSEX:		return SYSEX;			
+		default:						return 0;
+		};
+	}
+	
+	bool is_integer(const Evoral::Parameter& param) const {return true;}
+
+	Parameter new_parameter(uint32_t type, uint8_t channel, uint32_t id) const {
+		Parameter p(type, channel, id);
+		p.set_range(type, 0.0f, 1.0f, 0.0f);
+		return p;
+	}
+
+	std::string to_symbol(const Parameter& param) const {return "control";}
 };
 
 template<typename Time>
 class MySequence : public Sequence<Time> {
 public:
 	MySequence(DummyTypeMap&map, int size) : Sequence<Time>(map, size) {}
+	
+	boost::shared_ptr<Control> control_factory(const Parameter& param) {
+		
+		return boost::shared_ptr<Control>(
+			new Control(param, boost::shared_ptr<ControlList> (
+				new ControlList(param)
+		)));
+	}
+};
 
-	boost::shared_ptr<Control> control_factory(const Parameter& param) {return boost::shared_ptr<Control>();}
+template<typename Time>
+class TestSink : public EventSink<Time> {
+public:
+	sigc::signal<uint32_t, Time, EventType, uint32_t, const uint8_t*> writing;
+	
+	virtual uint32_t write(Time time, EventType type, uint32_t size, const uint8_t* buf) {
+		writing(time, type, size, buf);
+	}
 };
 
 class SequenceTest : public CppUnit::TestFixture
 {
     CPPUNIT_TEST_SUITE (SequenceTest);
     CPPUNIT_TEST (createTest);
+    CPPUNIT_TEST (preserveEventOrderingTest);
     CPPUNIT_TEST_SUITE_END ();
 
     public:
-        void setUp (void) { Glib::thread_init(); }
+    
-        void tearDown (void) {}
+    	typedef double Time;
+       	typedef std::vector<boost::shared_ptr<Note<Time> > > Notes;
+       	
+        void setUp (void) { 
+        	std::cerr << "SetUp" << std::endl;
+        	type_map = new DummyTypeMap();
+           	assert(type_map);
+           	seq = new MySequence<Time>(*type_map, 0);
+           	assert(seq);
+           	
+           	for(int i = 0; i < 12; i++) {
+           		test_notes.push_back(boost::shared_ptr<Note<Time> >
+					(new Note<Time>(0, i * 100, 100, 64 + i, 64)));
+           	}
+        }
+        
+        void tearDown (void) {
+        	test_notes.clear();
+        	delete seq;
+        	delete type_map;
+        }
 
         void createTest (void);
+        void preserveEventOrderingTest (void);
 
     private:
+       	DummyTypeMap*       type_map;
+       	MySequence<Time>*   seq;
+       	
+       	Notes test_notes;
+       	       	
+       	
 };

libs/evoral/test/testrunner.cpp

@@ -5,10 +5,13 @@
 #include <cppunit/TestRunner.h>
 #include <cppunit/BriefTestProgressListener.h>
 
+#include <glibmm.h>
 
 int
 main()
 {
+	Glib::thread_init();
+	
     CppUnit::TestResult testresult;
 
     CppUnit::TestResultCollector collectedresults;

libs/evoral/wscript

@@ -16,6 +16,13 @@ EVORAL_LIB_VERSION = '0.0.0'
 APPNAME = 'evoral'
 VERSION = EVORAL_VERSION
 
+# Custom variables
+DEBUG = True
+if DEBUG:
+	cxxflags = '-g'
+else:
+	cxxflags = ''
+
 # Mandatory variables
 srcdir = '.'
 blddir = 'build'
@@ -58,6 +65,7 @@ def build(bld):
 	obj.target       = 'evoral'
 	obj.uselib       = 'GLIBMM GTHREAD'
 	obj.vnum         = EVORAL_LIB_VERSION
+	obj.cxxflags     = cxxflags
 	obj.install_path = ''
 	
 	# Unit tests
@@ -70,8 +78,10 @@ def build(bld):
 	obj.uselib_local = 'libevoral'
 	obj.uselib       = 'CPPUNIT'
 	obj.target       = 'run-tests'
+	obj.cxxflags     = cxxflags
 	obj.install_path = ''
 
+
 def shutdown():
 	autowaf.shutdown()