X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fevoral%2Fsrc%2FMIDIEvent.cpp;h=c642bc3cc378133885a9ae8058320844ca8714f0;hb=eaa7cc5a73416c4b8672ccbf8e53c049e7279285;hp=0ae45c749d45a9e8509b9321af91da353a887cc9;hpb=c5aa71782890fc652531f89f8676cdcc99fa8f53;p=ardour.git

diff --git a/libs/evoral/src/MIDIEvent.cpp b/libs/evoral/src/MIDIEvent.cpp
index 0ae45c749d..c642bc3cc3 100644
--- 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 <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,11 +51,12 @@ 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");
@@ -56,22 +64,24 @@ MIDIEvent::to_xml() const
 		result->add_property("Control", cc_number());
 		result->add_property("Value",   cc_value());
 		break;
-			
+
 	case MIDI_CMD_PGM_CHANGE:
 		result = new XMLNode("ProgramChange");
 		result->add_property("Channel", channel());
 		result->add_property("Number",  pgm_number());
 		break;
-		
+
 	default:
 		// The implementation is continued as needed
 		break;
 	}
-	
+
 	return boost::shared_ptr<XMLNode>(result);
 }
 
 #endif // EVORAL_MIDI_XML
 
-} // namespace MIDI
+template class MIDIEvent<Evoral::MusicalTime>;
+
+} // namespace Evoral