diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-12-03 22:26:29 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-12-03 22:26:29 +0000 |
| commit | 73192bc1a7ea55fa1864dc3826845b15c00dd2ec (patch) | |
| tree | c0039f3f5a848aed6e880abf11519dad855fa899 /libs/ardour/meter.cc | |
| parent | 74b4a3c77b08dc1e58274875604eb73e8492fa93 (diff) | |
Remove all use of nframes_t.
git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/meter.cc')
| -rw-r--r-- | libs/ardour/meter.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc index 443146cf13..226cf417f3 100644 --- a/libs/ardour/meter.cc +++ b/libs/ardour/meter.cc @@ -39,7 +39,7 @@ PBD::Signal0<void> Metering::Meter; * be set to 0. */ void -PeakMeter::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/, nframes_t nframes, bool) +PeakMeter::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/, pframes_t nframes, bool) { if (!_active && !_pending_active) { return; @@ -54,7 +54,7 @@ PeakMeter::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_fr for (uint32_t i = 0; i < n_midi; ++i, ++n) { float val = 0.0f; for (MidiBuffer::iterator e = bufs.get_midi(i).begin(); e != bufs.get_midi(i).end(); ++e) { - const Evoral::MIDIEvent<nframes_t> ev(*e, false); + const Evoral::MIDIEvent<framepos_t> ev(*e, 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; if (this_vel > val) { |