attempt to handle poly-pressure (polyphonic aftertouch) similarly to other MIDI messages
This commit is contained in:
parent
c229e31720
commit
d6691a80e9
@ -71,7 +71,7 @@ public:
|
|||||||
inline bool is_pitch_bender() const { return (type() == MIDI_CMD_BENDER); }
|
inline bool is_pitch_bender() const { return (type() == MIDI_CMD_BENDER); }
|
||||||
inline bool is_pgm_change() const { return (type() == MIDI_CMD_PGM_CHANGE); }
|
inline bool is_pgm_change() const { return (type() == MIDI_CMD_PGM_CHANGE); }
|
||||||
inline bool is_note() const { return (is_note_on() || is_note_off()); }
|
inline bool is_note() const { return (is_note_on() || is_note_off()); }
|
||||||
inline bool is_aftertouch() const { return (type() == MIDI_CMD_NOTE_PRESSURE); }
|
inline bool is_poly_pressure() const { return (type() == MIDI_CMD_NOTE_PRESSURE); }
|
||||||
inline bool is_channel_pressure() const { return (type() == MIDI_CMD_CHANNEL_PRESSURE); }
|
inline bool is_channel_pressure() const { return (type() == MIDI_CMD_CHANNEL_PRESSURE); }
|
||||||
inline uint8_t note() const { return (this->_buf[1]); }
|
inline uint8_t note() const { return (this->_buf[1]); }
|
||||||
inline void set_note(uint8_t n) { this->_buf[1] = n; }
|
inline void set_note(uint8_t n) { this->_buf[1] = n; }
|
||||||
@ -92,7 +92,8 @@ public:
|
|||||||
| (0x7F & this->_buf[1]) ); }
|
| (0x7F & this->_buf[1]) ); }
|
||||||
inline uint8_t pgm_number() const { return (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 void set_pgm_number(uint8_t number) { this->_buf[1] = number; }
|
||||||
inline uint8_t aftertouch() const { return (this->_buf[1]); }
|
inline uint8_t poly_note() const { return (this->_buf[1]); }
|
||||||
|
inline uint8_t poly_pressure() const { return (this->_buf[2]); }
|
||||||
inline uint8_t channel_pressure() 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_smf_meta_event() const { return this->_buf[0] == 0xFF; }
|
||||||
@ -112,7 +113,7 @@ public:
|
|||||||
case MIDI_CMD_BENDER:
|
case MIDI_CMD_BENDER:
|
||||||
return pitch_bender_value();
|
return pitch_bender_value();
|
||||||
case MIDI_CMD_NOTE_PRESSURE:
|
case MIDI_CMD_NOTE_PRESSURE:
|
||||||
return aftertouch();
|
return poly_pressure();
|
||||||
case MIDI_CMD_CHANNEL_PRESSURE:
|
case MIDI_CMD_CHANNEL_PRESSURE:
|
||||||
return channel_pressure();
|
return channel_pressure();
|
||||||
default:
|
default:
|
||||||
|
@ -338,6 +338,7 @@ SMF::append_event_delta(uint32_t delta_t, uint32_t size, const uint8_t* buf, eve
|
|||||||
bool const store_id = (
|
bool const store_id = (
|
||||||
c == MIDI_CMD_NOTE_ON ||
|
c == MIDI_CMD_NOTE_ON ||
|
||||||
c == MIDI_CMD_NOTE_OFF ||
|
c == MIDI_CMD_NOTE_OFF ||
|
||||||
|
c == MIDI_CMD_NOTE_PRESSURE ||
|
||||||
c == MIDI_CMD_PGM_CHANGE ||
|
c == MIDI_CMD_PGM_CHANGE ||
|
||||||
(c == MIDI_CMD_CONTROL && (buf[1] == MIDI_CTL_MSB_BANK || buf[1] == MIDI_CTL_LSB_BANK))
|
(c == MIDI_CMD_CONTROL && (buf[1] == MIDI_CTL_MSB_BANK || buf[1] == MIDI_CTL_LSB_BANK))
|
||||||
);
|
);
|
||||||
|
@ -933,6 +933,8 @@ Sequence<Time>::append(const Event<Time>& event, event_id_t evid)
|
|||||||
ev.time(), double ((0x7F & ev.pitch_bender_msb()) << 7
|
ev.time(), double ((0x7F & ev.pitch_bender_msb()) << 7
|
||||||
| (0x7F & ev.pitch_bender_lsb())),
|
| (0x7F & ev.pitch_bender_lsb())),
|
||||||
evid);
|
evid);
|
||||||
|
} else if (ev.is_poly_pressure()) {
|
||||||
|
append_control_unlocked (Parameter (ev.event_type(), ev.channel(), ev.poly_note()), ev.time(), ev.poly_pressure(), evid);
|
||||||
} else if (ev.is_channel_pressure()) {
|
} else if (ev.is_channel_pressure()) {
|
||||||
append_control_unlocked(
|
append_control_unlocked(
|
||||||
Parameter(ev.event_type(), ev.channel()),
|
Parameter(ev.event_type(), ev.channel()),
|
||||||
|
Loading…
Reference in New Issue
Block a user