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

fix ever increasing MIDI event IDs

Browse source 
Iterating over a const Midi-Sequence calls Evoral::Sequence::set_event(),
which in turn used Evoral::Event::operator=()  which always created
a new event-ID (create copy of the event).

Issues fixed:
 - Saving *unmodified* MIDI produced new event-IDs on every save;
   files changed with every save. - greetings to Deva.
 - all [GUI] operations that use IDs to refer to notes e.g. undo.
   invalid undo-history.

Also clarify assignment operator name. Prefer explicit assign() over =.
This commit is contained in:
Robin Gareus 2015-09-18 17:34:12 +02:00
parent c12e8cc47c
commit 8b2fb88f15
3 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

27
libs/evoral/src/Event.cpp
View file

@ -107,30 +107,29 @@ Event<Timestamp>::~Event() {
}
template<typename Timestamp>
const Event<Timestamp>&
Event<Timestamp>::operator=(const Event& copy)
void
Event<Timestamp>::assign(const Event& other)
{
_id = next_event_id ();
_type = copy._type;
_original_time = copy._original_time;
_nominal_time = copy._nominal_time;
_owns_buf = copy._owns_buf;
_id = other._id;
_type = other._type;
_original_time = other._original_time;
_nominal_time = other._nominal_time;
_owns_buf = other._owns_buf;
if (_owns_buf) {
if (copy._buf) {
if (copy._size > _size) {
_buf = (uint8_t*)::realloc(_buf, copy._size);
if (other._buf) {
if (other._size > _size) {
_buf = (uint8_t*)::realloc(_buf, other._size);
}
memcpy(_buf, copy._buf, copy._size);
memcpy(_buf, other._buf, other._size);
} else {
free(_buf);
_buf = NULL;
}
} else {
_buf = copy._buf;
_buf = other._buf;
}
_size = copy._size;
return *this;
_size = other._size;
}
template<typename Timestamp>