diff options
| author | David Robillard <d@drobilla.net> | 2009-02-14 23:41:05 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-02-14 23:41:05 +0000 |
| commit | de2681f7cddc95e5a859c40e24d302631336a35a (patch) | |
| tree | 5d33cc86ad8bc88a681d72338235794291aa6b6f /libs/evoral/src | |
| parent | d0cc3120ae1d2f58942a6cdd1120dd0de1510aba (diff) | |
Remove superfluous typedefs.
Don't set range on sysex parameters (fix warning).
git-svn-id: svn://localhost/ardour2/branches/3.0@4568 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/evoral/src')
| -rw-r--r-- | libs/evoral/src/Note.cpp | 2 | ||||
| -rw-r--r-- | libs/evoral/src/Sequence.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libs/evoral/src/Note.cpp b/libs/evoral/src/Note.cpp index 794fe33c48..3915489d02 100644 --- a/libs/evoral/src/Note.cpp +++ b/libs/evoral/src/Note.cpp @@ -22,7 +22,7 @@ namespace Evoral { template<typename Time> -Note<Time>::Note(uint8_t chan, Time t, EventLength l, uint8_t n, uint8_t v) +Note<Time>::Note(uint8_t chan, Time t, Time l, uint8_t n, uint8_t v) // FIXME: types? : _on_event(0xDE, t, 3, NULL, true) , _off_event(0xAD, t + l, 3, NULL, true) diff --git a/libs/evoral/src/Sequence.cpp b/libs/evoral/src/Sequence.cpp index 78a9adda80..cec5495629 100644 --- a/libs/evoral/src/Sequence.cpp +++ b/libs/evoral/src/Sequence.cpp @@ -446,16 +446,16 @@ Sequence<Time>::Sequence(const TypeMap& type_map, size_t size) assert( ! _end_iter._locked); } -/** Read events in frame range \a start .. \a start+cnt into \a dst, +/** Read events in frame range \a start .. \a (start + dur) into \a dst, * adding \a offset to each event's timestamp. * \return number of events written to \a dst */ template<typename Time> size_t -Sequence<Time>::read(EventSink<Time>& dst, timestamp_t start, timedur_t nframes, timestamp_t offset) const +Sequence<Time>::read(EventSink<Time>& dst, Time start, Time dur, Time offset) const { #ifdef DEBUG_SEQUENCE - debugout << this << " read @ " << start << " * " << nframes << " + " << offset << endl; + debugout << this << " read @ " << start << " * " << dur << " + " << offset << endl; debugout << this << " # notes: " << n_notes() << endl; debugout << this << " # controls: " << _controls.size() << endl; #endif @@ -466,16 +466,16 @@ Sequence<Time>::read(EventSink<Time>& dst, timestamp_t start, timedur_t nframes, #ifdef DEBUG_SEQUENCE debugout << "Repositioning iterator from " << _next_read << " to " << start << endl; #endif - _read_iter = const_iterator(*this, (double)start); + _read_iter = const_iterator(*this, start); } else { #ifdef DEBUG_SEQUENCE debugout << "Using cached iterator at " << _next_read << endl; #endif } - _next_read = (FrameTime) floor (start + nframes); + _next_read = start + dur; - while (_read_iter != end() && _read_iter->time() < start + nframes) { + while (_read_iter != end() && _read_iter->time() < start + dur) { assert(_read_iter->size() > 0); assert(_read_iter->buffer()); dst.write(_read_iter->time() + offset, |