diff options
Diffstat (limited to 'libs/evoral/test')
-rw-r--r-- | libs/evoral/test/SMFTest.cpp | 12 | ||||
-rw-r--r-- | libs/evoral/test/SMFTest.hpp | 3 | ||||
-rw-r--r-- | libs/evoral/test/SequenceTest.cpp | 5 | ||||
-rw-r--r-- | libs/evoral/test/SequenceTest.hpp | 9 |
4 files changed, 15 insertions, 14 deletions
diff --git a/libs/evoral/test/SMFTest.cpp b/libs/evoral/test/SMFTest.cpp index fe9efa479f..cf34a17ba3 100644 --- a/libs/evoral/test/SMFTest.cpp +++ b/libs/evoral/test/SMFTest.cpp @@ -29,27 +29,25 @@ SMFTest::takeFiveTest () smf.seek_to_start(); uint64_t time = 0; /* in SMF ticks */ - Evoral::Event<double> ev; - - const double frames_per_beat = 100.0; + Evoral::Event<Evoral::MusicalTime> 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, 0.0); + ev.set(buf, size, Evoral::MusicalTime()); time += delta_t; if (ret > 0) { // didn't skip (meta) event //cerr << "read smf event type " << hex << int(buf[0]) << endl; - // make ev.time absolute time in frames - ev.set_time(time * frames_per_beat / (double)smf.ppqn()); + ev.set_time(Evoral::MusicalTime::ticks_at_rate(time, smf.ppqn())); ev.set_event_type(type_map->midi_event_type(buf[0])); seq->append(ev, next_event_id ()); } } - seq->end_write (Sequence<Time>::Relax, false); + seq->end_write (Sequence<Time>::Relax, + Evoral::MusicalTime::ticks_at_rate(time, smf.ppqn())); CPPUNIT_ASSERT(!seq->empty()); } diff --git a/libs/evoral/test/SMFTest.hpp b/libs/evoral/test/SMFTest.hpp index 9b5d2d54e3..6e42b6f7b3 100644 --- a/libs/evoral/test/SMFTest.hpp +++ b/libs/evoral/test/SMFTest.hpp @@ -21,6 +21,7 @@ #include <sigc++/sigc++.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> +#include "evoral/types.hpp" #include "evoral/SMF.hpp" #include "SequenceTest.hpp" @@ -56,7 +57,7 @@ class SMFTest : public CppUnit::TestFixture CPPUNIT_TEST_SUITE_END(); public: - typedef double Time; + typedef Evoral::MusicalTime Time; void setUp() { type_map = new DummyTypeMap(); diff --git a/libs/evoral/test/SequenceTest.cpp b/libs/evoral/test/SequenceTest.cpp index 6e07776fdb..32af5098a8 100644 --- a/libs/evoral/test/SequenceTest.cpp +++ b/libs/evoral/test/SequenceTest.cpp @@ -5,6 +5,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(SequenceTest); using namespace std; +using namespace Evoral; void SequenceTest::createTest () @@ -75,7 +76,7 @@ SequenceTest::iteratorSeekTest () } 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(((const MIDIEvent<Time>&)*i).is_note_on()); CPPUNIT_ASSERT_EQUAL(i->time(), Time((num_notes + 6) * 100)); @@ -136,7 +137,7 @@ SequenceTest::controlInterpolationTest () 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(); diff --git a/libs/evoral/test/SequenceTest.hpp b/libs/evoral/test/SequenceTest.hpp index 79af6779fb..7b79d8fc12 100644 --- a/libs/evoral/test/SequenceTest.hpp +++ b/libs/evoral/test/SequenceTest.hpp @@ -39,7 +39,7 @@ public: }; } - bool is_integer (const Evoral::Parameter& /*param*/) const { return true; } + bool is_integer (const Parameter& /*param*/) const { return true; } Parameter new_parameter(uint32_t type, uint8_t channel, uint32_t id) const { Parameter p(type, channel, id); @@ -119,7 +119,7 @@ class SequenceTest : public CppUnit::TestFixture CPPUNIT_TEST_SUITE_END (); public: - typedef double Time; + typedef MusicalTime Time; typedef std::vector< boost::shared_ptr< Note<Time> > > Notes; void setUp () { @@ -129,8 +129,9 @@ public: 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))); + test_notes.push_back( + boost::shared_ptr<Note<Time> >( + new Note<Time>(0, MusicalTime(i * 100), MusicalTime(100), 64 + i, 64))); } } |