ardour/livetrax
13
0
Fork 0
Code

Make Evoral::Event ids unique always.

Browse Source 
- 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.
This commit is contained in:
nick_m 2015-05-24 01:53:34 +10:00
parent 9a55bcb04f
commit 92b69a17da
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/evoral/src/Event.cpp
View File

@ -86,7 +86,7 @@ Event<Timestamp>::Event(const Event& copy, bool owns_buf)
, _nominal_time(copy._nominal_time) , _nominal_time(copy._nominal_time)
, _size(copy._size) , _size(copy._size)
, _buf(copy._buf) , _buf(copy._buf)
, _id(copy.id()) , _id (next_event_id ())
, _owns_buf(owns_buf) , _owns_buf(owns_buf)
{ {
if (owns_buf) { if (owns_buf) {
@ -110,7 +110,7 @@ template<typename Timestamp>
const Event<Timestamp>& const Event<Timestamp>&
Event<Timestamp>::operator=(const Event& copy) Event<Timestamp>::operator=(const Event& copy)
{ {
_id = copy.id(); // XXX is this right? do we want ID copy semantics? _id = next_event_id ();
_type = copy._type; _type = copy._type;
_original_time = copy._original_time; _original_time = copy._original_time;
_nominal_time = copy._nominal_time; _nominal_time = copy._nominal_time;