Fix my name :)

[ardour.git] / libs / evoral / evoral / MIDIEvent.hpp

diff --git a/libs/evoral/evoral/MIDIEvent.hpp b/libs/evoral/evoral/MIDIEvent.hpp
index d6751db0a8c44fe4ead7f99c50a2cea7f7740eab..c27a716a3e8fb5e3fae108dc131ff7199edaa7eb 100644 (file)
--- a/libs/evoral/evoral/MIDIEvent.hpp
+++ b/libs/evoral/evoral/MIDIEvent.hpp
@@ -1,16 +1,16 @@
 /* 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
@@ -19,6 +19,7 @@
 #ifndef EVORAL_MIDI_EVENT_HPP
 #define EVORAL_MIDI_EVENT_HPP
 
+#include <cmath>
 #include <boost/shared_ptr.hpp>
 #include "evoral/Event.hpp"
 #include "evoral/midi_events.h"
@@ -36,21 +37,19 @@ namespace Evoral {
  */
 template<typename Time>
 struct MIDIEvent : public Event<Time> {
-       MIDIEvent(EventType type=0, Time timestamp=0, uint32_t size=0, uint8_t* buffer=NULL, bool alloc=false)
-               : Event<Time>(type, timestamp, size, buffer, alloc)
+       MIDIEvent(EventType type=0, Time time=0, uint32_t size=0, uint8_t* buf=NULL, bool alloc=false)
+               : Event<Time>(type, time, size, buf, alloc)
        {}
-       
+
        MIDIEvent(const Event<Time>& copy, bool alloc)
                : Event<Time>(copy, alloc)
        {}
 
 #ifdef EVORAL_MIDI_XML
-       /** Event from XML ala http://www.midi.org/dtds/MIDIEvents10.dtd
-        */
+       /** Event from XML ala http://www.midi.org/dtds/MIDIEvents10.dtd */
        MIDIEvent(const XMLNode& event);
-       
-       /** Event to XML ala http://www.midi.org/dtds/MIDIEvents10.dtd
-        */
+
+       /** Event to XML ala http://www.midi.org/dtds/MIDIEvents10.dtd */
        boost::shared_ptr<XMLNode> to_xml() const;
 #endif
 
@@ -69,7 +68,14 @@ struct MIDIEvent : public Event<Time> {
        inline bool     is_aftertouch()         const { return (type() == MIDI_CMD_NOTE_PRESSURE); }
        inline bool     is_channel_pressure()   const { return (type() == MIDI_CMD_CHANNEL_PRESSURE); }
        inline uint8_t  note()                  const { return (this->_buf[1]); }
+       inline void     set_note(uint8_t n)           { this->_buf[1] = n; }
        inline uint8_t  velocity()              const { return (this->_buf[2]); }
+       inline void     set_velocity(uint8_t value)   { this->_buf[2] = value; }
+       inline void     scale_velocity(float factor)  {
+               if (factor < 0) factor = 0;
+               this->_buf[2] = (uint8_t) lrintf (this->_buf[2]*factor);
+               if (this->_buf[2] > 127) this->_buf[2] = 127;
+       }
        inline uint8_t  cc_number()             const { return (this->_buf[1]); }
        inline void     set_cc_number(uint8_t number) { this->_buf[1] = number; }
        inline uint8_t  cc_value()              const { return (this->_buf[2]); }
@@ -82,7 +88,7 @@ struct MIDIEvent : public Event<Time> {
        inline void     set_pgm_number(uint8_t number){ this->_buf[1] = number; }
        inline uint8_t  aftertouch()            const { return (this->_buf[1]); }
        inline uint8_t  channel_pressure()      const { return (this->_buf[1]); }
-       inline bool     is_channel_event()      const { return (0x80 <= type()) && (type() <= 0xE0);    }
+       inline bool     is_channel_event()      const { return (0x80 <= type()) && (type() <= 0xE0); }
        inline bool     is_smf_meta_event()     const { return this->_buf[0] == 0xFF; }
        inline bool     is_sysex()              const { return this->_buf[0] == 0xF0
                                                            || this->_buf[0] == 0xF7; }