add channel+pitch indexing for notes in a Sequence

[ardour.git] / libs / evoral / src / Event.cpp

diff --git a/libs/evoral/src/Event.cpp b/libs/evoral/src/Event.cpp
index 532b8b498a1ed598505a1cd6cbb60f56b34380f6..b64ab7347c99564f3f7d2b1e761f51a52ffd9eb7 100644 (file)
--- a/libs/evoral/src/Event.cpp
+++ b/libs/evoral/src/Event.cpp
@@ -1,16 +1,16 @@
 /* This file is part of Evoral.
  * Copyright (C) 2008 Dave Robillard <http://drobilla.net>
  * Copyright (C) 2000-2008 Paul Davis
- * 
+ *
  * Evoral is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version.
- * 
+ *
  * Evoral is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -23,17 +23,18 @@ namespace Evoral {
 #ifdef EVORAL_EVENT_ALLOC
 
 template<typename Timestamp>
-Event<Timestamp>::Event(EventType type, Timestamp timestamp, uint32_t size, uint8_t* buffer, bool alloc)
+Event<Timestamp>::Event(EventType type, Timestamp time, uint32_t size, uint8_t* buf, bool alloc)
        : _type(type)
-       , _time(timestamp)
+       , _original_time(time)
+       , _nominal_time(time)
        , _size(size)
-       , _buf(buffer)
+       , _buf(buf)
        , _owns_buf(alloc)
 {
        if (alloc) {
                _buf = (uint8_t*)malloc(_size);
-               if (buffer) {
-                       memcpy(_buf, buffer, _size);
+               if (buf) {
+                       memcpy(_buf, buf, _size);
                } else {
                        memset(_buf, 0, _size);
                }
@@ -43,7 +44,8 @@ Event<Timestamp>::Event(EventType type, Timestamp timestamp, uint32_t size, uint
 template<typename Timestamp>
 Event<Timestamp>::Event(const Event& copy, bool owns_buf)
        : _type(copy._type)
-       , _time(copy._time)
+       , _original_time(copy._original_time)
+       , _nominal_time(copy._nominal_time)
        , _size(copy._size)
        , _buf(copy._buf)
        , _owns_buf(owns_buf)
@@ -67,7 +69,8 @@ Event<Timestamp>::~Event() {
 
 #endif // EVORAL_EVENT_ALLOC
 
-template class Event<double>;
+template class Event<Evoral::MusicalTime>;
+template class Event<uint32_t>;
 
 } // namespace Evoral