Merge branch 'master' into cairocanvas

[ardour.git] / libs / evoral / test / SequenceTest.cpp

diff --git a/libs/evoral/test/SequenceTest.cpp b/libs/evoral/test/SequenceTest.cpp
index 2c5c17f4d862ffb3b136694de4502f2d684a8a9e..69931b8e0d221afbd438b0926d9ffe188bb17cd4 100644 (file)
--- a/libs/evoral/test/SequenceTest.cpp
+++ b/libs/evoral/test/SequenceTest.cpp
@@ -29,28 +29,28 @@ SequenceTest::preserveEventOrderingTest ()
                );
 
                event->buffer()[0] = MIDI_CMD_CONTROL;
-               event->buffer()[1] = event->time() / 100;
-               event->buffer()[2] = event->time() / 100;
+               event->buffer()[1] = event->time() / 1000;
+               event->buffer()[2] = event->time() / 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));
@@ -77,12 +77,12 @@ SequenceTest::iteratorSeekTest ()
        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(((MIDIEvent<Time>&)*i).is_note_off());
+                       CPPUNIT_ASSERT(((const MIDIEvent<Time>&)*i).is_note_off());
                        on = true;
                }
        }
@@ -99,8 +99,8 @@ SequenceTest::controlInterpolationTest ()
                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);
@@ -109,9 +109,9 @@ SequenceTest::controlInterpolationTest ()
        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);