From 92b69a17da49a314aa8b0693e0a1ccef925b9bf9 Mon Sep 17 00:00:00 2001 From: nick_m Date: Sun, 24 May 2015 01:53:34 +1000 Subject: [PATCH] Make Evoral::Event ids unique always. - probably fixes a lot of cases where note ids are assumed to be unique (they weren't for copies and some others). - wrong branch, but it needs testing. --- libs/evoral/src/Event.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/evoral/src/Event.cpp b/libs/evoral/src/Event.cpp index da31662951..45935ccf8d 100644 --- a/libs/evoral/src/Event.cpp +++ b/libs/evoral/src/Event.cpp @@ -86,7 +86,7 @@ Event::Event(const Event& copy, bool owns_buf) , _nominal_time(copy._nominal_time) , _size(copy._size) , _buf(copy._buf) - , _id(copy.id()) + , _id (next_event_id ()) , _owns_buf(owns_buf) { if (owns_buf) { @@ -110,7 +110,7 @@ template const Event& Event::operator=(const Event& copy) { - _id = copy.id(); // XXX is this right? do we want ID copy semantics? + _id = next_event_id (); _type = copy._type; _original_time = copy._original_time; _nominal_time = copy._nominal_time;