Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CoreMidi] Implement Xcode 16.0 beta 1-6 changes. #20882

Merged
merged 5 commits into from
Sep 16, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions src/CoreMidi/MidiServices.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2544,6 +2544,23 @@ public bool UmpCanTransmitGroupless {
SetInt (MidiPropertyExtensions.kMIDIPropertyUMPCanTransmitGroupless, value ? 1 : 0);
}
}

#if NET
[SupportedOSPlatform ("ios18.0")]
[SupportedOSPlatform ("maccatalyst18.0")]
[SupportedOSPlatform ("macos15.0")]
[UnsupportedOSPlatform ("tvos")]
#else
[NoWatch, NoTV, Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
#endif
public int AssociatedEndpoint {
get {
return GetInt (MidiPropertyExtensions.kMIDIPropertyAssociatedEndpoint);
}
set {
SetInt (MidiPropertyExtensions.kMIDIPropertyAssociatedEndpoint, value);
}
}
// MidiEndpoint
#endif // !COREBUILD
}
Expand All @@ -2557,6 +2574,14 @@ enum MidiNotificationMessageId : int {
ThruConnectionsChanged,
SerialPortOwnerChanged,
IOError,
#if !MONOMAC
#if NET
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("macos")]
#endif
InternalStart = 0x1000,
#endif
}

//
Expand Down
165 changes: 165 additions & 0 deletions src/CoreMidi/MidiStructs.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
#if !TVOS && !WATCH
#nullable enable

using System;
using System.Runtime.InteropServices;

using ObjCRuntime;
using CoreFoundation;
using Foundation;

using MidiObjectRef = System.Int32;
using MidiClientRef = System.Int32;
using MidiDeviceRef = System.Int32;
using MidiDeviceListRef = System.Int32;
using MidiPortRef = System.Int32;
using MidiEndpointRef = System.Int32;
using MidiEntityRef = System.Int32;

namespace CoreMidi {
#if NET
[SupportedOSPlatform ("ios18.0")]
[SupportedOSPlatform ("maccatalyst18.0")]
[SupportedOSPlatform ("macos15.0")]
[SupportedOSPlatform ("tvos18.0")]
#else
[Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
#endif
[NativeName ("MIDI2DeviceManufacturer")]
public struct Midi2DeviceManufacturer {
// Byte sysExIDByte[3]; // 1-byte SysEx IDs are padded with trailing zeroes
byte sysExIdByte0;
byte sysExIdByte1;
byte sysExIdByte2;

public byte [] SysExIdByte {
get {
return new byte [] { sysExIdByte0, sysExIdByte1, sysExIdByte2 };
}
set {
if (value is null)
ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (value));
if (value.Length != 3)
ObjCRuntime.ThrowHelper.ThrowArgumentOutOfRangeException (nameof (value), "Length must be 3");

sysExIdByte0 = value [0];
sysExIdByte1 = value [1];
sysExIdByte2 = value [2];
}
}
}

#if NET
[SupportedOSPlatform ("ios18.0")]
[SupportedOSPlatform ("maccatalyst18.0")]
[SupportedOSPlatform ("macos15.0")]
[SupportedOSPlatform ("tvos18.0")]
#else
[Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
#endif
[NativeName ("MIDI2DeviceRevisionLevel")]
public struct Midi2DeviceRevisionLevel {
// Byte revisionLevel[4];
byte revisionLevel0;
byte revisionLevel1;
byte revisionLevel2;
byte revisionLevel3;

public byte [] RevisionLevel {
get {
return new byte [] { revisionLevel0, revisionLevel1, revisionLevel2, revisionLevel3 };
}
set {
if (value is null)
ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (value));
if (value.Length != 4)
ObjCRuntime.ThrowHelper.ThrowArgumentOutOfRangeException (nameof (value), "Length must be 4");

revisionLevel0 = value [0];
revisionLevel1 = value [1];
revisionLevel2 = value [2];
revisionLevel3 = value [3];
}
}
}

#if NET
[SupportedOSPlatform ("ios18.0")]
[SupportedOSPlatform ("maccatalyst18.0")]
[SupportedOSPlatform ("macos15.0")]
[SupportedOSPlatform ("tvos18.0")]
#else
[Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
#endif
[NativeName ("MIDICIProfileIDStandard")]
public struct MidiCIProfileIdStandard {
public byte /* MIDIUInteger7 */ ProfileIdByte1;
public byte /* MIDIUInteger7 */ ProfileBank;
public byte /* MIDIUInteger7 */ ProfileNumber;
public byte /* MIDIUInteger7 */ ProfileVersion;
public byte /* MIDIUInteger7 */ ProfileLevel;
}

#if NET
[SupportedOSPlatform ("ios18.0")]
[SupportedOSPlatform ("maccatalyst18.0")]
[SupportedOSPlatform ("macos15.0")]
[SupportedOSPlatform ("tvos18.0")]
#else
[Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
#endif
[NativeName ("MIDICIProfileIDManufacturerSpecific")]
public struct MidiCIProfileIdManufacturerSpecific {
public byte /* MIDIUInteger7 */ SysExId1;
public byte /* MIDIUInteger7 */ SysExId2;
public byte /* MIDIUInteger7 */ SysExId3;
public byte /* MIDIUInteger7 */ Info1;
public byte /* MIDIUInteger7 */ Info2;
}

#if NET
[SupportedOSPlatform ("ios18.0")]
[SupportedOSPlatform ("maccatalyst18.0")]
[SupportedOSPlatform ("macos15.0")]
[SupportedOSPlatform ("tvos18.0")]
#else
[Watch (11, 0), TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
#endif
[NativeName ("MIDICIProfileID")]
public struct MidiCIProfileId {
// This is a union between MidiCIProfileIdStandard and MidiCIProfileIdManufacturerSpecific, each with the same size (5 bytes)
// So declare a struct with 5 bytes, and then do some memory copies to convert to each element of the union.
byte /* MIDIUInteger7 */ Value0;
byte /* MIDIUInteger7 */ Value1;
byte /* MIDIUInteger7 */ Value2;
byte /* MIDIUInteger7 */ Value3;
byte /* MIDIUInteger7 */ Value4;

public unsafe MidiCIProfileIdStandard Standard {
get {
fixed (MidiCIProfileId* self = &this) {
return *(MidiCIProfileIdStandard*) self;
}
}
set {
fixed (MidiCIProfileId* self = &this) {
*self = *(MidiCIProfileId*) &value;
}
}
}

public unsafe MidiCIProfileIdManufacturerSpecific ManufacturerSpecific {
get {
fixed (MidiCIProfileId* self = &this) {
return *(MidiCIProfileIdManufacturerSpecific*) self;
}
}
set {
fixed (MidiCIProfileId* self = &this) {
*self = *(MidiCIProfileId*) &value;
}
}
}
}
}
#endif
Loading
Loading