projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge with master
[ardour.git]
/
libs
/
evoral
/
test
/
SequenceTest.cpp
diff --git
a/libs/evoral/test/SequenceTest.cpp
b/libs/evoral/test/SequenceTest.cpp
index e0ea71fd730204b4a50ed1a1f02ebb6931616041..69931b8e0d221afbd438b0926d9ffe188bb17cd4 100644
(file)
--- a/
libs/evoral/test/SequenceTest.cpp
+++ b/
libs/evoral/test/SequenceTest.cpp
@@
-50,7
+50,7
@@
SequenceTest::preserveEventOrderingTest ()
));
}
));
}
- seq->end_write
(
);
+ seq->end_write
(Sequence<Time>::Relax
);
TestSink<Time> sink;
sink.writing.connect(sigc::mem_fun(&sink, &TestSink<Time>::assertLastEventTimeEarlier));
TestSink<Time> sink;
sink.writing.connect(sigc::mem_fun(&sink, &TestSink<Time>::assertLastEventTimeEarlier));
@@
-77,12
+77,12
@@
SequenceTest::iteratorSeekTest ()
bool on = true;
for (Sequence<Time>::const_iterator i = seq->begin(600); i != seq->end(); ++i) {
if (on) {
bool on = true;
for (Sequence<Time>::const_iterator i = seq->begin(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_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;
}
}
on = true;
}
}
@@
-99,8
+99,8
@@
SequenceTest::controlInterpolationTest ()
seq->notes().insert(*i);
}
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);
CPPUNIT_ASSERT(c);
boost::shared_ptr<Control> c = seq->control(MIDI::ContinuousController(cc_type, 1, 1), true);
CPPUNIT_ASSERT(c);
@@
-109,9
+109,9
@@
SequenceTest::controlInterpolationTest ()
MIDI::controller_range(min, max, normal);
// Make a ramp like /\ from min to max and back to min
MIDI::controller_range(min, max, normal);
// 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);
CCTestSink<Time> sink(cc_type);