summaryrefslogtreecommitdiff
path: root/libs/midi++2
diff options
context:
space:
mode:
authorHans Baier <hansfbaier@googlemail.com>2008-05-02 19:09:32 +0000
committerHans Baier <hansfbaier@googlemail.com>2008-05-02 19:09:32 +0000
commit0e394fb66b707b530d4b54991acbadb2a79c5e03 (patch)
treeeb678570921883cbb91ac43d9aecdbffc5522d77 /libs/midi++2
parentda45f489dd3d923bbba8f1cee39ab445c4bf1b64 (diff)
* removed old implementation for Program Changes from MidiModel
* Added Automation based implementation for Program Changes, Pitch Bender and Channel Aftertouch git-svn-id: svn://localhost/ardour2/branches/3.0@3304 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/midi++2')
-rw-r--r--libs/midi++2/midi++/event.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/midi++2/midi++/event.h b/libs/midi++2/midi++/event.h
index efe1ddfbac..79f78c35e9 100644
--- a/libs/midi++2/midi++/event.h
+++ b/libs/midi++2/midi++/event.h
@@ -181,7 +181,9 @@ struct Event {
inline uint8_t velocity() const { return (_buffer[2]); }
inline uint8_t cc_number() const { return (_buffer[1]); }
inline uint8_t cc_value() const { return (_buffer[2]); }
- inline uint16_t pitch_bender_value() const { return ((_buffer[1] << 8) | _buffer[2]); }
+ inline uint16_t pitch_bender_value() const { return (((0x7F & _buffer[1]) << 7) | (0x7F & _buffer[2])); }
+ inline uint8_t pitch_bender_lsb() const { return (_buffer[1]); }
+ inline uint8_t pitch_bender_msb() const { return (_buffer[2]); }
inline uint8_t pgm_number() const { return (_buffer[1]); }
inline void set_pgm_number(uint8_t number){ _buffer[1] = number; }
inline uint8_t aftertouch() const { return (_buffer[1]); }