Remove Evoral::MIDIEvent

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

diff --git a/libs/evoral/src/Note.cpp b/libs/evoral/src/Note.cpp
index 794fe33c48ac5993761de2f1cbd511776441e437..3b56a33241d2f6fb7c2c2603f4c583584acc6a5f 100644 (file)
--- a/libs/evoral/src/Note.cpp
+++ b/libs/evoral/src/Note.cpp
@@ -1,42 +1,49 @@
 /* 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 <cassert>
 #include <iostream>
+#include <limits>
+#include <glib.h>
+#ifndef COMPILER_MSVC
 #include "evoral/Note.hpp"
+#endif
+
+#include "evoral/Beats.hpp"
 
 namespace Evoral {
 
 template<typename Time>
-Note<Time>::Note(uint8_t chan, Time t, EventLength l, uint8_t n, uint8_t v)
+Note<Time>::Note(uint8_t chan, Time t, Time l, uint8_t n, uint8_t v)
        // FIXME: types?
-       : _on_event(0xDE, t, 3, NULL, true)
-       , _off_event(0xAD, t + l, 3, NULL, true)
+       : _on_event (0xDE, t, 3, NULL, true)
+       , _off_event (0xAD, t + l, 3, NULL, true)
 {
        assert(chan < 16);
 
        _on_event.buffer()[0] = MIDI_CMD_NOTE_ON + chan;
        _on_event.buffer()[1] = n;
        _on_event.buffer()[2] = v;
-       
+
        _off_event.buffer()[0] = MIDI_CMD_NOTE_OFF + chan;
        _off_event.buffer()[1] = n;
        _off_event.buffer()[2] = 0x40;
-       
+
        assert(time() == t);
        assert(length() == l);
        assert(note() == n);
@@ -51,52 +58,60 @@ Note<Time>::Note(const Note<Time>& copy)
        : _on_event(copy._on_event, true)
        , _off_event(copy._off_event, true)
 {
+       set_id (copy.id());
+
        assert(_on_event.buffer());
        assert(_off_event.buffer());
        /*
-       assert(copy._on_event.size == 3);
-       _on_event.buffer = _on_event_buffer;
-       memcpy(_on_event_buffer, copy._on_event_buffer, 3);
-       
-       assert(copy._off_event.size == 3);
-       _off_event.buffer = _off_event_buffer;
-       memcpy(_off_event_buffer, copy._off_event_buffer, 3);
+         assert(copy._on_event.size == 3);
+         _on_event.buffer = _on_event_buffer;
+         memcpy(_on_event_buffer, copy._on_event_buffer, 3);
+
+         assert(copy._off_event.size == 3);
+         _off_event.buffer = _off_event_buffer;
+         memcpy(_off_event_buffer, copy._off_event_buffer, 3);
        */
 
        assert(time() == copy.time());
        assert(end_time() == copy.end_time());
+       assert(length() == copy.length());
        assert(note() == copy.note());
        assert(velocity() == copy.velocity());
-       assert(length() == copy.length());
        assert(_on_event.channel() == _off_event.channel());
        assert(channel() == copy.channel());
 }
 
-
 template<typename Time>
 Note<Time>::~Note()
 {
 }
 
+template<typename Time> void
+Note<Time>::set_id (event_id_t id)
+{
+       _on_event.set_id (id);
+       _off_event.set_id (id);
+}
 
 template<typename Time>
 const Note<Time>&
-Note<Time>::operator=(const Note<Time>& copy)
+Note<Time>::operator=(const Note<Time>& other)
 {
-       _on_event = copy._on_event;
-       _off_event = copy._off_event;
-       
-       assert(time() == copy.time());
-       assert(end_time() == copy.end_time());
-       assert(note() == copy.note());
-       assert(velocity() == copy.velocity());
-       assert(length() == copy.length());
+       _on_event = other._on_event;
+       _off_event = other._off_event;
+
+       assert(time() == other.time());
+       assert(end_time() == other.end_time());
+       assert(length() == other.length());
+       assert(note() == other.note());
+       assert(velocity() == other.velocity());
        assert(_on_event.channel() == _off_event.channel());
-       assert(channel() == copy.channel());
-       
+       assert(channel() == other.channel());
+
        return *this;
 }
 
-template class Note<double>;
+template class Note<Evoral::Beats>;
 
 } // namespace Evoral
+