diff options
-rw-r--r-- | libs/evoral/test/BeatsTest.cpp | 3 | ||||
-rw-r--r-- | libs/evoral/test/NoteTest.cpp | 8 | ||||
-rw-r--r-- | libs/evoral/test/SMFTest.cpp | 10 | ||||
-rw-r--r-- | libs/evoral/test/SMFTest.hpp | 4 | ||||
-rw-r--r-- | libs/evoral/test/SequenceTest.cpp | 8 | ||||
-rw-r--r-- | libs/evoral/test/SequenceTest.hpp | 6 |
6 files changed, 20 insertions, 19 deletions
diff --git a/libs/evoral/test/BeatsTest.cpp b/libs/evoral/test/BeatsTest.cpp index 0e3d29a6c6..07eab1f1ec 100644 --- a/libs/evoral/test/BeatsTest.cpp +++ b/libs/evoral/test/BeatsTest.cpp @@ -1,11 +1,12 @@ #include <stdlib.h> #include "BeatsTest.hpp" -#include "evoral/Beats.hpp" +#include "temporal/beats.h" CPPUNIT_TEST_SUITE_REGISTRATION(BeatsTest); using namespace Evoral; +using namespace Temporal; static const double delta = 1.5 / (double)Beats::PPQN; diff --git a/libs/evoral/test/NoteTest.cpp b/libs/evoral/test/NoteTest.cpp index b96cd7c351..ead96f1d99 100644 --- a/libs/evoral/test/NoteTest.cpp +++ b/libs/evoral/test/NoteTest.cpp @@ -1,18 +1,18 @@ #include "NoteTest.hpp" +#include "temporal/beats.h" #include "evoral/Note.hpp" -#include "evoral/Beats.hpp" #include <stdlib.h> CPPUNIT_TEST_SUITE_REGISTRATION (NoteTest); using namespace Evoral; -typedef Beats Time; +typedef Temporal::Beats Time; void NoteTest::copyTest () { - Note<Time> a(0, Beats(1.0), Beats(2.0), 60, 0x40); + Note<Time> a(0, Time(1.0), Time(2.0), 60, 0x40); Note<Time> b(a); CPPUNIT_ASSERT (a == b); @@ -25,7 +25,7 @@ NoteTest::copyTest () void NoteTest::idTest () { - Note<Time> a(0, Beats(1.0), Beats(2.0), 60, 0x40); + Note<Time> a(0, Time(1.0), Time(2.0), 60, 0x40); CPPUNIT_ASSERT_EQUAL (-1, a.id()); a.set_id(1234); diff --git a/libs/evoral/test/SMFTest.cpp b/libs/evoral/test/SMFTest.cpp index b177ca9108..7a7f1cdbe0 100644 --- a/libs/evoral/test/SMFTest.cpp +++ b/libs/evoral/test/SMFTest.cpp @@ -51,33 +51,33 @@ SMFTest::takeFiveTest () smf.seek_to_start(); uint64_t time = 0; /* in SMF ticks */ - Evoral::Event<Evoral::Beats> ev; + Evoral::Event<Time> ev; uint32_t delta_t = 0; uint32_t size = 0; uint8_t* buf = NULL; int ret; while ((ret = smf.read_event(&delta_t, &size, &buf)) >= 0) { - ev.set(buf, size, Evoral::Beats()); + ev.set(buf, size, Time()); time += delta_t; if (ret > 0) { // didn't skip (meta) event //cerr << "read smf event type " << hex << int(buf[0]) << endl; - ev.set_time(Evoral::Beats::ticks_at_rate(time, smf.ppqn())); + ev.set_time(Temporal::Beats::ticks_at_rate(time, smf.ppqn())); ev.set_event_type(Evoral::MIDI_EVENT); seq->append(ev, next_event_id ()); } } seq->end_write (Sequence<Time>::Relax, - Evoral::Beats::ticks_at_rate(time, smf.ppqn())); + Temporal::Beats::ticks_at_rate(time, smf.ppqn())); CPPUNIT_ASSERT(!seq->empty()); // Iterate over all notes bool on = true; size_t num_notes = 0; size_t num_sysexes = 0; - for (Sequence<Time>::const_iterator i = seq->begin(Evoral::Beats()); i != seq->end(); ++i) { + for (Sequence<Time>::const_iterator i = seq->begin(Time()); i != seq->end(); ++i) { if (i->is_note_on()) { ++num_notes; } else if (i->is_sysex()) { diff --git a/libs/evoral/test/SMFTest.hpp b/libs/evoral/test/SMFTest.hpp index a9e086a343..8d6db113b1 100644 --- a/libs/evoral/test/SMFTest.hpp +++ b/libs/evoral/test/SMFTest.hpp @@ -23,7 +23,7 @@ #include <sigc++/sigc++.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include "evoral/types.hpp" +#include "temporal/beats.h" #include "evoral/SMF.hpp" #include "SequenceTest.hpp" @@ -60,7 +60,7 @@ class SMFTest : public CppUnit::TestFixture CPPUNIT_TEST_SUITE_END(); public: - typedef Evoral::Beats Time; + typedef Temporal::Beats Time; void setUp() { type_map = new DummyTypeMap(); diff --git a/libs/evoral/test/SequenceTest.cpp b/libs/evoral/test/SequenceTest.cpp index 53bd8a4fdf..6a5fbb64cf 100644 --- a/libs/evoral/test/SequenceTest.cpp +++ b/libs/evoral/test/SequenceTest.cpp @@ -88,7 +88,7 @@ SequenceTest::iteratorSeekTest () // Iterate over all notes bool on = true; - for (Sequence<Time>::const_iterator i = seq->begin(Evoral::Beats(600)); i != seq->end(); ++i) { + for (Sequence<Time>::const_iterator i = seq->begin(Time(600)); i != seq->end(); ++i) { if (on) { CPPUNIT_ASSERT(i->is_note_on()); CPPUNIT_ASSERT_EQUAL(i->time(), Time((num_notes + 6) * 100)); @@ -161,11 +161,11 @@ SequenceTest::controlInterpolationTest () sink.write(i->time(), i->event_type(), i->size(), i->buffer()); } CPPUNIT_ASSERT_EQUAL((size_t)3, sink.events.size()); - CPPUNIT_ASSERT_EQUAL(Evoral::Beats(0), sink.events[0].first); + CPPUNIT_ASSERT_EQUAL(Time(0), sink.events[0].first); CPPUNIT_ASSERT_EQUAL((uint8_t)0, sink.events[0].second); - CPPUNIT_ASSERT_EQUAL(Evoral::Beats(1000), sink.events[1].first); + CPPUNIT_ASSERT_EQUAL(Time(1000), sink.events[1].first); CPPUNIT_ASSERT_EQUAL((uint8_t)127, sink.events[1].second); - CPPUNIT_ASSERT_EQUAL(Evoral::Beats(2000), sink.events[2].first); + CPPUNIT_ASSERT_EQUAL(Time(2000), sink.events[2].first); CPPUNIT_ASSERT_EQUAL((uint8_t)0, sink.events[2].second); sink.events.clear(); CPPUNIT_ASSERT_EQUAL((size_t)0, sink.events.size()); diff --git a/libs/evoral/test/SequenceTest.hpp b/libs/evoral/test/SequenceTest.hpp index 10e34d89b6..5547606d2e 100644 --- a/libs/evoral/test/SequenceTest.hpp +++ b/libs/evoral/test/SequenceTest.hpp @@ -2,7 +2,7 @@ #include <sigc++/sigc++.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include "evoral/Beats.hpp" +#include "temporal/beats.h" #include "evoral/Sequence.hpp" #include "evoral/TypeMap.hpp" #include "evoral/EventSink.hpp" @@ -119,7 +119,7 @@ class SequenceTest : public CppUnit::TestFixture CPPUNIT_TEST_SUITE_END (); public: - typedef Beats Time; + typedef Temporal::Beats Time; typedef std::vector< boost::shared_ptr< Note<Time> > > Notes; void setUp () { @@ -131,7 +131,7 @@ public: for (int i = 0; i < 12; i++) { test_notes.push_back( boost::shared_ptr<Note<Time> >( - new Note<Time>(0, Beats(i * 100), Beats(100), 64 + i, 64))); + new Note<Time>(0, Time(i * 100), Time(100), 64 + i, 64))); } } |