- {
- MidiBuffer merge_buffer(0);
- Evoral::MIDIEvent onstack_events[_capacity];
- uint8_t onstack_data[_capacity * MAX_EVENT_SIZE];
- merge_buffer._events = onstack_events;
- merge_buffer._data = onstack_data;
- merge_buffer._size = 0;
+ if (_size + other.size() > _capacity) {
+ cerr << "MidiBuffer::merge failed (no space)" << endl;
+ return false;
+ }
+
+#ifndef NDEBUG
+ size_t test_orig_us_size = _size;
+ size_t test_orig_them_size = other._size;
+ TimeType test_time = 0;
+ size_t test_us_count = 0;
+ size_t test_them_count = 0;
+ for (iterator i = begin(); i != end(); ++i) {
+ assert(Evoral::midi_event_is_valid((*i).buffer(), (*i).size()));
+ assert((*i).time() >= test_time);
+ test_time = (*i).time();
+ ++test_us_count;
+ }
+ test_time = 0;
+ for (const_iterator i = other.begin(); i != other.end(); ++i) {
+ assert(Evoral::midi_event_is_valid((*i).buffer(), (*i).size()));
+ assert((*i).time() >= test_time);
+ test_time = (*i).time();
+ ++test_them_count;
+ }
+#endif
+
+ const_iterator them = other.begin();
+ iterator us = begin();
+
+ while (them != other.end()) {
+
+ size_t sz = 0;
+ ssize_t src = -1;
+
+ /* gather up total size of events that are earlier than
+ the event referenced by "us"
+ */
+
+ while (them != other.end() && (*them).time() <= (*us).time()) {
+ if (src == -1) {
+ src = them.offset;
+ }
+ sz += sizeof (TimeType) + (*them).size();
+ ++them;
+ }
+
+ if (us != end())
+ cerr << "us @ " << (*us).time() << endl;
+ if (them != other.end())
+ cerr << "them @ " << (*them).time() << endl;
+
+ if (sz) {
+ assert(src >= 0);
+ /* move existing */
+ memmove (_data + us.offset + sz, _data + us.offset, _size - us.offset);
+ /* increase _size */
+ _size += sz;
+ assert(_size <= _capacity);
+ /* insert new stuff */
+ memcpy (_data + us.offset, other._data + src, sz);
+ /* update iterator to our own events. this is a miserable hack */
+ us.offset += sz;
+ } else {