From f696086892c10dedfc5ad785c4a597111030cf7f Mon Sep 17 00:00:00 2001 From: SolfaMode Date: Sun, 29 Sep 2024 16:17:21 +0200 Subject: [PATCH] Remove destinationProtocolId, because CoreMIDI translates MIDI2.0 <=> MIDI 1.0, if necessary. --- .../internal/platform/osx/coremidioutport.cpp | 17 ----------------- .../internal/platform/osx/coremidioutport.h | 1 - 2 files changed, 18 deletions(-) diff --git a/src/framework/midi/internal/platform/osx/coremidioutport.cpp b/src/framework/midi/internal/platform/osx/coremidioutport.cpp index a3269c25785bb..073b2aacc3bdf 100644 --- a/src/framework/midi/internal/platform/osx/coremidioutport.cpp +++ b/src/framework/midi/internal/platform/osx/coremidioutport.cpp @@ -48,7 +48,6 @@ struct muse::midi::CoreMidiOutPort::Core { MIDIClientRef client = 0; MIDIPortRef outputPort = 0; MIDIEndpointRef destinationId = 0; - MIDIProtocolID destinationProtocolId = kMIDIProtocol_1_0; int deviceID = -1; }; @@ -81,15 +80,6 @@ void CoreMidiOutPort::deinit() } } -void CoreMidiOutPort::getDestinationProtocolId() -{ - if (__builtin_available(macOS 11.0, *)) { - SInt32 protocol = 0; - OSStatus err = MIDIObjectGetIntegerProperty(m_core->destinationId, kMIDIPropertyProtocolID, &protocol); - m_core->destinationProtocolId = err == noErr ? (MIDIProtocolID)protocol : kMIDIProtocol_1_0; - } -} - void CoreMidiOutPort::initCore() { OSStatus result; @@ -141,11 +131,6 @@ void CoreMidiOutPort::initCore() if (CFStringCompare(propertyChangeNotification->propertyName, kMIDIPropertyDisplayName, 0) == kCFCompareEqualTo || CFStringCompare(propertyChangeNotification->propertyName, kMIDIPropertyName, 0) == kCFCompareEqualTo) { self->availableDevicesChanged().notify(); - } else if (__builtin_available(macOS 11.0, *)) { - if (CFStringCompare(propertyChangeNotification->propertyName, kMIDIPropertyProtocolID, 0) == kCFCompareEqualTo - && self->isConnected() && propertyChangeNotification->object == self->m_core->destinationId) { - self->getDestinationProtocolId(); - } } } break; @@ -247,8 +232,6 @@ Ret CoreMidiOutPort::connect(const MidiDeviceID& deviceID) m_core->deviceID = std::stoi(deviceID); m_core->destinationId = (MIDIEndpointRef)obj; - - getDestinationProtocolId(); } m_deviceID = deviceID; diff --git a/src/framework/midi/internal/platform/osx/coremidioutport.h b/src/framework/midi/internal/platform/osx/coremidioutport.h index 5f5d27e22b52b..fddb815d1cfa6 100644 --- a/src/framework/midi/internal/platform/osx/coremidioutport.h +++ b/src/framework/midi/internal/platform/osx/coremidioutport.h @@ -56,7 +56,6 @@ class CoreMidiOutPort : public IMidiOutPort private: void initCore(); - void getDestinationProtocolId(); struct Core; std::unique_ptr m_core;