Fix some warnings.

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

diff --git a/libs/evoral/src/Event.cpp b/libs/evoral/src/Event.cpp
index 99a94e0215e22def0b655e2f3478190e4451df3e..d0e0e8ac3a4ea9bd22c57a3c4f07d80b9a761aa3 100644 (file)
--- a/libs/evoral/src/Event.cpp
+++ b/libs/evoral/src/Event.cpp
@@ -1,68 +1,157 @@
 /* This file is part of Evoral.
- * Copyright (C) 2008 Dave Robillard <http://drobilla.net>
+ * Copyright (C) 2008 David 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
  */
 
-#include <evoral/Event.hpp>
+#include <glib.h>
+#include "evoral/Event.hpp"
 
 namespace Evoral {
 
+static event_id_t _event_id_counter = 0;
+
+event_id_t
+event_id_counter()
+{
+       return g_atomic_int_get (&_event_id_counter); 
+}
+
+void 
+init_event_id_counter(event_id_t n) 
+{ 
+       g_atomic_int_set (&_event_id_counter, n); 
+}
+
+event_id_t
+next_event_id ()
+{
+       return g_atomic_int_exchange_and_add (&_event_id_counter, 1);
+}
+
 #ifdef EVORAL_EVENT_ALLOC
 
-Event::Event(uint32_t tid, EventTime t, uint32_t s, uint8_t* b, bool owns_buffer)
-       : _type(tid)
-       , _time(t)
-       , _size(s)
-       , _buffer(b)
-       , _owns_buffer(owns_buffer)
+template<typename Timestamp>
+Event<Timestamp>::Event(EventType type, Timestamp time, uint32_t size, uint8_t* buf, bool alloc)
+       : _type(type)
+       , _original_time(time)
+       , _nominal_time(time)
+       , _size(size)
+       , _buf(buf)
+       , _id(-1)
+       , _owns_buf(alloc)
 {
-       if (owns_buffer) {
-               _buffer = (uint8_t*)malloc(_size);
-               if (b) {
-                       memcpy(_buffer, b, _size);
+       if (alloc) {
+               _buf = (uint8_t*)malloc(_size);
+               if (buf) {
+                       memcpy(_buf, buf, _size);
                } else {
-                       memset(_buffer, 0, _size);
+                       memset(_buf, 0, _size);
                }
        }
 }
 
-Event::Event(const Event& copy, bool owns_buffer)
+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)
-       , _buffer(copy._buffer)
-       , _owns_buffer(owns_buffer)
+       , _buf(copy._buf)
+       , _id(copy.id())
+       , _owns_buf(owns_buf)
+{
+       if (owns_buf) {
+               _buf = (uint8_t*)malloc(_size);
+               if (copy._buf) {
+                       memcpy(_buf, copy._buf, _size);
+               } else {
+                       memset(_buf, 0, _size);
+               }
+       }
+}
+
+template<typename Timestamp>
+Event<Timestamp>::~Event() {
+       if (_owns_buf) {
+               free(_buf);
+       }
+}
+
+template<typename Timestamp>
+const Event<Timestamp>&
+Event<Timestamp>::operator=(const Event& copy)
 {
-       if (owns_buffer) {
-               _buffer = (uint8_t*)malloc(_size);
-               if (copy._buffer) {
-                       memcpy(_buffer, copy._buffer, _size);
+       _id = copy.id(); // XXX is this right? do we want ID copy semantics?
+       _type = copy._type;
+       _original_time = copy._original_time;
+       _nominal_time = copy._nominal_time;
+       if (_owns_buf) {
+               if (copy._buf) {
+                       if (copy._size > _size) {
+                               _buf = (uint8_t*)::realloc(_buf, copy._size);
+                       }
+                       memcpy(_buf, copy._buf, copy._size);
                } else {
-                       memset(_buffer, 0, _size);
+                       free(_buf);
+                       _buf = NULL;
                }
+       } else {
+               _buf = copy._buf;
        }
+
+       _size = copy._size;
+       return *this;
 }
 
-Event::~Event() {
-       if (_owns_buffer) {
-               free(_buffer);
+template<typename Timestamp>
+void
+Event<Timestamp>::set(uint8_t* buf, uint32_t size, Timestamp t)
+{
+       if (_owns_buf) {
+               if (_size < size) {
+                       _buf = (uint8_t*) ::realloc(_buf, size);
+               }
+               memcpy (_buf, buf, size);
+       } else {
+               _buf = buf;
        }
+
+       _original_time = t;
+       _nominal_time = t;
+       _size = size;
+}
+
+template<typename Timestamp>
+void
+Event<Timestamp>::set_time (Timestamp t)
+{
+       _nominal_time = t;
 }
 
+template<typename Timestamp>
+void
+Event<Timestamp>::set_original_time (Timestamp t)
+{
+       _original_time = t;
+}
+       
 #endif // EVORAL_EVENT_ALLOC
 
-} // namespace MIDI
+template class Event<Evoral::MusicalTime>;
+template class Event<int64_t>;
+
+} // namespace Evoral