diff --git a/ChangeLog b/ChangeLog index b3461c6334..d2b747ed01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ XXXX-XX-XX the hydrogen team * Release 1.2.1 * Update French translation * Bugfixes + - Fix MIDI Machine Control (MMC) event type handling on Windows + (#1773) - Fix loading of legacy drumkits. All layers but the first one were dropped during drumkit upgrade (#1759) - Fix MIDI input handling with "Discard MIDI messages after action diff --git a/src/core/IO/MidiCommon.h b/src/core/IO/MidiCommon.h index 0692b2cf29..580f4fe21f 100644 --- a/src/core/IO/MidiCommon.h +++ b/src/core/IO/MidiCommon.h @@ -47,7 +47,6 @@ class MidiMessage PROGRAM_CHANGE, CHANNEL_PRESSURE, PITCH_WHEEL, - SYSTEM_EXCLUSIVE, START, CONTINUE, STOP, @@ -96,9 +95,6 @@ inline QString MidiMessage::TypeToQString( MidiMessageType type ) { case MidiMessageType::PITCH_WHEEL: sType = "PITCH_WHEEL"; break; - case MidiMessageType::SYSTEM_EXCLUSIVE: - sType = "SYSTEM_EXCLUSIVE"; - break; case MidiMessageType::START: sType = "START"; break; diff --git a/src/core/IO/MidiInput.cpp b/src/core/IO/MidiInput.cpp index ba51f4b92d..0085d88919 100644 --- a/src/core/IO/MidiInput.cpp +++ b/src/core/IO/MidiInput.cpp @@ -70,7 +70,6 @@ void MidiInput::handleMidiMessage( const MidiMessage& msg ) // exclude all midi channel filter independent messages int type = msg.m_type; if ( MidiMessage::SYSEX == type - || MidiMessage::SYSTEM_EXCLUSIVE == type || MidiMessage::START == type || MidiMessage::CONTINUE == type || MidiMessage::STOP == type @@ -138,7 +137,6 @@ void MidiInput::handleMidiMessage( const MidiMessage& msg ) case MidiMessage::CHANNEL_PRESSURE: case MidiMessage::PITCH_WHEEL: - case MidiMessage::SYSTEM_EXCLUSIVE: case MidiMessage::SONG_POS: case MidiMessage::QUARTER_FRAME: ERRORLOG( QString( "MIDI message of type [%1] is not supported by Hydrogen" ) diff --git a/src/core/IO/PortMidiDriver.cpp b/src/core/IO/PortMidiDriver.cpp index f870855e16..9d40713017 100644 --- a/src/core/IO/PortMidiDriver.cpp +++ b/src/core/IO/PortMidiDriver.cpp @@ -87,7 +87,7 @@ void* PortMidiDriver_thread( void* param ) msg.m_type = MidiMessage::PITCH_WHEEL; } else if ( ( nEventType >= 240 ) && ( nEventType < 256 ) ) { // System Exclusive msg.m_nChannel = nEventType - 240; - msg.m_type = MidiMessage::SYSTEM_EXCLUSIVE; + msg.m_type = MidiMessage::SYSEX; } else { __ERRORLOG( "Unhandled midi message type: " + QString::number( nEventType ) ); __INFOLOG( "MIDI msg: " );