X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fevoral%2Fevoral%2FMIDIEvent.hpp;h=00e8577cda76e3406e28c1a26f5d26a8c6065b20;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hp=79d013e00fce26faebb6ae4cf12ae85f6f089099;hpb=60e6b5d561db1ebcc15dd48f49350daa487e248a;p=ardour.git

diff --git a/libs/evoral/evoral/MIDIEvent.hpp b/libs/evoral/evoral/MIDIEvent.hpp
index 79d013e00f..00e8577cda 100644
--- a/libs/evoral/evoral/MIDIEvent.hpp
+++ b/libs/evoral/evoral/MIDIEvent.hpp
@@ -21,8 +21,11 @@
 
 #include <cmath>
 #include <boost/shared_ptr.hpp>
+
+#include "evoral/visibility.h"
 #include "evoral/Event.hpp"
 #include "evoral/midi_events.h"
+
 #ifdef EVORAL_MIDI_XML
 class XMLNode;
 #endif
@@ -31,12 +34,13 @@ namespace Evoral {
 
 /** MIDI helper functions for an Event.
  *
- * This class contains no data, an event can be cast to a MIDIEvent
- * but the application must make sure the event actually contains
+ * This class contains no data, an Evoral::Event can be cast to a MIDIEvent
+ * but the application must make sure the Event actually contains
  * valid MIDI data for these functions to make sense.
  */
 template<typename Time>
-struct MIDIEvent : public Event<Time> {
+class /*LIBEVORAL_API*/ MIDIEvent : public Event<Time> {
+public:
 	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)
 	{}
@@ -56,9 +60,11 @@ struct MIDIEvent : public Event<Time> {
 	inline uint8_t  type()                  const { return (this->_buf[0] & 0xF0); }
 	inline void     set_type(uint8_t type)        { this->_buf[0] =   (0x0F & this->_buf[0])
 	                                                                | (0xF0 & type); }
+
 	inline uint8_t  channel()               const { return (this->_buf[0] & 0x0F); }
 	inline void     set_channel(uint8_t channel)  { this->_buf[0] =   (0xF0 & this->_buf[0])
 	                                                                | (0x0F & channel); }
+
 	inline bool     is_note_on()            const { return (type() == MIDI_CMD_NOTE_ON); }
 	inline bool     is_note_off()           const { return (type() == MIDI_CMD_NOTE_OFF); }
 	inline bool     is_cc()                 const { return (type() == MIDI_CMD_CONTROL); }
@@ -79,24 +85,39 @@ struct MIDIEvent : public Event<Time> {
 	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]); }
-	inline void     set_cc_value(uint8_t value)   { this->_buf[2] = value; }
+	inline void     set_cc_value(uint8_t value)   { this->_buf[2] = value;  }
 	inline uint8_t  pitch_bender_lsb()      const { return (this->_buf[1]); }
 	inline uint8_t  pitch_bender_msb()      const { return (this->_buf[2]); }
 	inline uint16_t pitch_bender_value()    const { return ( ((0x7F & this->_buf[2]) << 7)
 	                                                        | (0x7F & this->_buf[1]) ); }
-	inline uint8_t  pgm_number()            const { return (this->_buf[1]); }
-	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_smf_meta_event()     const { return this->_buf[0] == 0xFF; }
-	inline bool     is_sysex()              const { return this->_buf[0] == 0xF0
-	                                                    || this->_buf[0] == 0xF7; }
-        inline bool     is_spp()                const { return this->_buf[0] == 0xF2 && this->size() == 0; }
-        inline bool     is_mtc_quarter()        const { return this->_buf[0] == 0xF1 && this->size() == 0; }
-        inline bool     is_mtc_full()           const { 
-		return this->size() == 10 && this->_buf[0] == 0xf0 && this->_buf[1] == 0x7f && 
-			this->_buf[3] == 0x01 && this->_buf[4] == 0x01;
+	inline uint8_t  pgm_number()              const { return (this->_buf[1]); }
+	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_smf_meta_event()       const { return this->_buf[0] == 0xFF; }
+	inline bool     is_sysex()                const { return this->_buf[0] == 0xF0
+	                                                      || this->_buf[0] == 0xF7; }
+	inline bool     is_spp()                  const { return this->_buf[0] == 0xF2 && this->size() == 1; }
+	inline bool     is_mtc_quarter()          const { return this->_buf[0] == 0xF1 && this->size() == 1; }
+	inline bool     is_mtc_full()             const {
+		return this->size() == 10    && this->_buf[0] == 0xf0 && this->_buf[1] == 0x7f &&
+		       this->_buf[3] == 0x01 && this->_buf[4] == 0x01;
+	}
+
+	inline uint16_t value() const {
+		switch (type()) {
+		case MIDI_CMD_CONTROL:
+			return cc_value();
+		case MIDI_CMD_BENDER:
+			return pitch_bender_value();
+		case MIDI_CMD_NOTE_PRESSURE:
+			return aftertouch();
+		case MIDI_CMD_CHANNEL_PRESSURE:
+			return channel_pressure();
+		default:
+			return 0;
+		}
 	}
 };