smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 08:36:32 +01:00
Code Issues Projects Releases Wiki Activity

Templateify MidiBuffer iterators (avoid code duplication since they're about to get less trivial).

Browse source 
Clean up MidiBuffer code.


git-svn-id: svn://localhost/ardour2/branches/3.0@4469 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2009-02-01 03:15:31 +00:00
parent aaa91db6d9
commit e666c8e98f
3 changed files with 38 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

31
libs/ardour/ardour/midi_buffer.h
View file

@ -48,27 +48,22 @@ public:
bool merge(const MidiBuffer& a, const MidiBuffer& b); bool merge(const MidiBuffer& a, const MidiBuffer& b);
bool merge_in_place(const MidiBuffer &other); bool merge_in_place(const MidiBuffer &other);
struct iterator { template<typename B, typename E>
iterator(MidiBuffer& b, size_t i) : buffer(b), index(i) {} struct iterator_base {
iterator_base<B,E>(B& b, size_t i) : buffer(b), index(i) {}
inline Evoral::MIDIEvent& operator*() const { return buffer[index]; } inline E& operator*() const { return buffer[index]; }
inline iterator& operator++() { ++index; return *this; } // prefix inline iterator_base<B,E>& operator++() { ++index; return *this; } // prefix
inline bool operator!=(const iterator& other) const { return index != other.index; } inline bool operator!=(const iterator_base<B,E>& other) const {
return index != other.index;
}
MidiBuffer& buffer; B& buffer;
size_t index; size_t index;
}; };
struct const_iterator { typedef iterator_base<MidiBuffer, Evoral::MIDIEvent> iterator;
const_iterator(const MidiBuffer& b, size_t i) : buffer(b), index(i) {} typedef iterator_base<const MidiBuffer, const Evoral::MIDIEvent> const_iterator;
inline const Evoral::MIDIEvent& operator*() const { return buffer[index]; }
inline const_iterator& operator++() { ++index; return *this; } // prefix
inline bool operator!=(const const_iterator& other) const { return index != other.index; }
const MidiBuffer& buffer;
size_t index;
};
iterator begin() { return iterator(*this, 0); } iterator begin() { return iterator(*this, 0); }
iterator end() { return iterator(*this, _size); } iterator end() { return iterator(*this, _size); }
@ -78,8 +73,8 @@ public:
private: private:
friend class iterator; friend class iterator_base<MidiBuffer, Evoral::MIDIEvent>;
friend class const_iterator; friend class iterator_base<const MidiBuffer, const Evoral::MIDIEvent>;
const Evoral::MIDIEvent& operator[](size_t i) const { assert(i < _size); return _events[i]; } const Evoral::MIDIEvent& operator[](size_t i) const { assert(i < _size); return _events[i]; }
Evoral::MIDIEvent& operator[](size_t i) { assert(i < _size); return _events[i]; } Evoral::MIDIEvent& operator[](size_t i) { assert(i < _size); return _events[i]; }

19
libs/ardour/midi_buffer.cc
View file

@ -35,7 +35,6 @@ MidiBuffer::MidiBuffer(size_t capacity)
: Buffer(DataType::MIDI, capacity) : Buffer(DataType::MIDI, capacity)
, _events(0) , _events(0)
, _data(0) , _data(0)
// , _owns_data(false)
{ {
if (capacity) { if (capacity) {
resize(_capacity); resize(_capacity);
@ -62,13 +61,8 @@ MidiBuffer::resize (size_t size)
return; return;
} }
if (_data) {
free(_data); free(_data);
}
if (_events) {
free(_events); free(_events);
}
_size = 0; _size = 0;
_capacity = size; _capacity = size;
@ -220,8 +214,9 @@ MidiBuffer::reserve(double time, size_t size)
return 0; return 0;
} }
if (_size == _capacity) if (_size == _capacity) {
return 0; return 0;
}
uint8_t* const write_loc = _data + (_size * MAX_EVENT_SIZE); uint8_t* const write_loc = _data + (_size * MAX_EVENT_SIZE);
@ -253,8 +248,9 @@ MidiBuffer::silence(nframes_t dur, nframes_t offset)
bool bool
MidiBuffer::merge_in_place(const MidiBuffer &other) MidiBuffer::merge_in_place(const MidiBuffer &other)
{ {
if( other.size() == 0 ) if (other.size() == 0) {
return true; return true;
}
if (this->size() == 0) { if (this->size() == 0) {
copy(other); copy(other);
@ -294,12 +290,13 @@ MidiBuffer::merge(const MidiBuffer& a, const MidiBuffer& b)
{ {
_size = 0; _size = 0;
// This is mostly the case :( if (this == &a) {
if( this == &a )
merge_in_place(b); merge_in_place(b);
}
if( this == &b ) if (this == &b) {
merge_in_place(a); merge_in_place(a);
}
size_t a_index = 0; size_t a_index = 0;
size_t b_index = 0; size_t b_index = 0;

1
libs/midi++2/midi++/event.h
View file

@ -1,6 +1,5 @@
/* /*
Copyright (C) 2007 Paul Davis Copyright (C) 2007 Paul Davis
Author: Dave Robillard
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by