diff options
| author | David Robillard <d@drobilla.net> | 2014-11-22 04:05:42 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2014-11-22 04:05:42 -0500 |
| commit | c1cfa12d6e5136d2e3e5501e83ff74c5009a9e60 (patch) | |
| tree | 56d2811bc8b9d6f2a5accfa8e497ddd5976c7c7a /libs/evoral/test/SMFTest.cpp | |
| parent | cae74309a583c29dd6cc2081425c2e7b673ea13e (diff) | |
Wrap MusicalTime in a class.
This lets us get a more explicit handle on time conversions, and is the main
step towards using actual beat:tick time and getting away from floating point
precision problems.
Diffstat (limited to 'libs/evoral/test/SMFTest.cpp')
| -rw-r--r-- | libs/evoral/test/SMFTest.cpp | 12 |
1 files changed, 5 insertions, 7 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()); } |