diff options
author | David Robillard <d@drobilla.net> | 2009-02-15 01:24:26 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2009-02-15 01:24:26 +0000 |
commit | 5a48f99f72c2e2f3ed313e00446dfdaa05dc5d56 (patch) | |
tree | c67b0c1a4da8dde5146e21b6699d15f389041e68 /libs/ardour/meter.cc | |
parent | aefa9f0938d287c497878a6e29ce2f9e0bade7c5 (diff) |
Use nframes_t for timestamps of real (jack) time MIDI events (i.e. in MidiBuffer and MidiRingBuffer).
Use iterator interface of Sequence to read events in a MIDISource rather than Sequence::read, avoiding timestamp confusion.
Disable no longer useful Sequence::read.
git-svn-id: svn://localhost/ardour2/branches/3.0@4570 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/meter.cc')
-rw-r--r-- | libs/ardour/meter.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc index 39d7f63221..31a88b16f0 100644 --- a/libs/ardour/meter.cc +++ b/libs/ardour/meter.cc @@ -50,7 +50,7 @@ PeakMeter::run_in_place (BufferSet& bufs, nframes_t start_frame, nframes_t end_f // GUI needs a better MIDI meter, not much information can be // expressed through peaks alone for (MidiBuffer::iterator i = bufs.get_midi(n).begin(); i != bufs.get_midi(n).end(); ++i) { - const Evoral::MIDIEvent<double> ev(*i, false); + const Evoral::MIDIEvent<nframes_t> ev(*i, false); if (ev.is_note_on()) { const float this_vel = log(ev.buffer()[2] / 127.0 * (M_E*M_E-M_E) + M_E) - 1.0; //printf("V %d -> %f\n", (int)((Byte)ev.buffer[2]), this_vel); |