#include "SequenceTest.hpp"
-#include "evoral/MIDIParameters.hpp"
#include <cassert>
CPPUNIT_TEST_SUITE_REGISTRATION(SequenceTest);
using namespace std;
+using namespace Evoral;
void
SequenceTest::createTest ()
seq->start_write();
for (Notes::const_iterator i = test_notes.begin(); i != test_notes.end(); ++i) {
- uint8_t buffer[2];
+ uint8_t buffer[3];
Event<Time>* event = new Event<Time>(
DummyTypeMap::CONTROL, (*i)->on_event().time(), 3, buffer, true
);
event->buffer()[0] = MIDI_CMD_CONTROL;
- event->buffer()[1] = event->time() / 100;
- event->buffer()[2] = event->time() / 100;
+ event->buffer()[1] = event->time().to_double() / 1000;
+ event->buffer()[2] = event->time().to_double() / 1000;
boost::shared_ptr<Event<Time> > event_ptr(event);
- seq->append((*i)->on_event());
+ seq->append((*i)->on_event(), next_event_id ());
inserted_events.push_back(
boost::shared_ptr<Event<Time> >(
new Event<Time>((*i)->on_event(), true)
));
- seq->append(*event_ptr);
+ seq->append(*event_ptr, next_event_id ());
inserted_events.push_back(event_ptr);
- seq->append((*i)->off_event());
+ seq->append((*i)->off_event(), next_event_id ());
inserted_events.push_back(
boost::shared_ptr<Event<Time> >(
new Event<Time>((*i)->off_event(), true)
));
}
- seq->end_write();
+ seq->end_write (Sequence<Time>::Relax);
TestSink<Time> sink;
sink.writing.connect(sigc::mem_fun(&sink, &TestSink<Time>::assertLastEventTimeEarlier));
}
bool on = true;
- for (Sequence<Time>::const_iterator i = seq->begin(600); i != seq->end(); ++i) {
+ for (Sequence<Time>::const_iterator i = seq->begin(Evoral::MusicalTime(600)); i != seq->end(); ++i) {
if (on) {
- CPPUNIT_ASSERT(((MIDIEvent<Time>&)*i).is_note_on());
+ CPPUNIT_ASSERT(((const MIDIEvent<Time>&)*i).is_note_on());
CPPUNIT_ASSERT_EQUAL(i->time(), Time((num_notes + 6) * 100));
++num_notes;
on = false;
} else {
- CPPUNIT_ASSERT(((MIDIEvent<Time>&)*i).is_note_off());
+ CPPUNIT_ASSERT(((const MIDIEvent<Time>&)*i).is_note_off());
on = true;
}
}
seq->notes().insert(*i);
}
- static const FrameTime delay = 1000;
- static const uint32_t cc_type = 1;
+ static const uint64_t delay = 1000;
+ static const uint32_t cc_type = 1;
- boost::shared_ptr<Control> c = seq->control(MIDI::ContinuousController(cc_type, 1, 1), true);
+ boost::shared_ptr<Control> c = seq->control(Parameter(cc_type, 1, 1), true);
CPPUNIT_ASSERT(c);
- double min, max, normal;
- MIDI::controller_range(min, max, normal);
+ double min = 0.0;
+ double max = 127.0;
// Make a ramp like /\ from min to max and back to min
- c->set_float(min, true, 0);
- c->set_float(max, true, delay);
- c->set_float(min, true, 2*delay);
+ c->set_double(min, 0, true);
+ c->set_double(max, delay, true);
+ c->set_double(min, 2*delay, true);
CCTestSink<Time> sink(cc_type);
sink.write(i->time(), i->event_type(), i->size(), i->buffer());
}
CPPUNIT_ASSERT(sink.events.size() == 128 * 2 - 1);
- Time last_time = 0;
+ Time last_time(0);
int16_t last_value = -1;
bool ascending = true;
for (CCTestSink<Time>::Events::const_iterator i = sink.events.begin();