Remove unused ifdef gunk.

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

diff --git a/libs/evoral/src/MIDIEvent.cpp b/libs/evoral/src/MIDIEvent.cpp
index 7617d2ae9ae169a9e8970ee6ce12a5089365f998..4985f66cf43f31be72570ab18f44226b3127ea95 100644 (file)
--- a/libs/evoral/src/MIDIEvent.cpp
+++ b/libs/evoral/src/MIDIEvent.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 <evoral/MIDIEvent.hpp>
+#include <string>
+#include "evoral/MIDIEvent.hpp"
+#ifdef EVORAL_MIDI_XML
+       #include "pbd/xml++.h"
+#endif
+
+using namespace std;
 
 namespace Evoral {
 
 #ifdef EVORAL_MIDI_XML
 
-MIDIEvent::MIDIEvent(const XMLNode& event) 
-  : Event()
+template<typename Time>
+MIDIEvent<Time>::MIDIEvent(const XMLNode& event)
+  : Event<Time>()
 {
        string name = event.name();
-       
+
        if (name == "ControlChange") {
-               _buffer = (uint8_t*) ::malloc(3);
-               _owns_buffer = true;
+               this->_buf = (uint8_t*) ::malloc(3);
+               this->_owns_buf = true;
                set_type(MIDI_CMD_CONTROL);
-               
+
                set_cc_number(atoi(event.property("Control")->value().c_str()));
                set_cc_value (atoi(event.property("Value")->value().c_str()));
        } else if (name == "ProgramChange") {
-               _buffer = (uint8_t*) ::malloc(2);
-               _owns_buffer = true;
+               this->_buf = (uint8_t*) ::malloc(2);
+               this->_owns_buf = true;
                set_type(MIDI_CMD_PGM_CHANGE);
 
                set_pgm_number(atoi(event.property("Number")->value().c_str()));
@@ -44,34 +51,58 @@ MIDIEvent::MIDIEvent(const XMLNode& event)
 }
 
 
-boost::shared_ptr<XMLNode> 
-MIDIEvent::to_xml() const
+template<typename Time>
+boost::shared_ptr<XMLNode>
+MIDIEvent<Time>::to_xml() const
 {
        XMLNode *result = 0;
-       
+
        switch (type()) {
        case MIDI_CMD_CONTROL:
                result = new XMLNode("ControlChange");
-               result->add_property("Channel", channel());
-               result->add_property("Control", cc_number());
-               result->add_property("Value",   cc_value());
+               result->add_property("Channel", long(channel()));
+               result->add_property("Control", long(cc_number()));
+               result->add_property("Value",   long(cc_value()));
                break;
-                       
+
        case MIDI_CMD_PGM_CHANGE:
                result = new XMLNode("ProgramChange");
-               result->add_property("Channel", channel());
-               result->add_property("Number",  pgm_number());
+               result->add_property("Channel", long(channel()));
+               result->add_property("Number",  long(pgm_number()));
+               break;
+
+       case MIDI_CMD_NOTE_ON:
+               result = new XMLNode("NoteOn");
+               result->add_property("Channel", long(channel()));
+               result->add_property("Note",  long(note()));
+               result->add_property("Velocity",  long(velocity()));
                break;
-               
+
+       case MIDI_CMD_NOTE_OFF:
+               result = new XMLNode("NoteOff");
+               result->add_property("Channel", long(channel()));
+               result->add_property("Note",  long(note()));
+               result->add_property("Velocity",  long(velocity()));
+               break;
+
+       case MIDI_CMD_BENDER:
+               result = new XMLNode("PitchBendChange");
+               result->add_property("Channel", long(channel()));
+               result->add_property("Value",  long(pitch_bender_value()));
+               break;
+
        default:
                // The implementation is continued as needed
+               result = new XMLNode("NotImplemented");
                break;
        }
-       
+
        return boost::shared_ptr<XMLNode>(result);
 }
 
 #endif // EVORAL_MIDI_XML
 
-} // namespace MIDI
+template class MIDIEvent<Evoral::Beats>;
+
+} // namespace Evoral