* synchronised with r442 of the universal interfaces:

o fixed iOS/simulator compilation

git-svn-id: trunk@42548 -
This commit is contained in:
Jonas Maebe 2019-07-31 19:30:51 +00:00
parent 2c4c34ef9b
commit 62218e823f
2 changed files with 9 additions and 7 deletions

View File

@ -253,7 +253,7 @@ interface
{$setc TYPE_BOOL := FALSE} {$setc TYPE_BOOL := FALSE}
{$setc TYPE_EXTENDED := FALSE} {$setc TYPE_EXTENDED := FALSE}
{$setc TYPE_LONGLONG := TRUE} {$setc TYPE_LONGLONG := TRUE}
uses MacTypes,AudioComponents,CFBase,CFArray,CoreAudioTypes; uses MacTypes,AudioComponents,CFBase,CFArray,CFDate,CoreAudioTypes;
{$endc} {not MACOSALLINCLUDE} {$endc} {not MACOSALLINCLUDE}
{$ALIGN POWER} {$ALIGN POWER}
@ -264,7 +264,7 @@ uses MacTypes,AudioComponents,CFBase,CFArray,CoreAudioTypes;
//CF_ASSUME_NONNULL_BEGIN //CF_ASSUME_NONNULL_BEGIN
//#define AU_SUPPORT_INTERAPP_AUDIO (TARGET_OS_IPHONE && !(0 && !TARGET_OS_SIMULATOR && !TARGET_OS_EMBEDDED)) //#define AU_SUPPORT_INTERAPP_AUDIO (TARGET_OS_IPHONE && !(0 && !TARGET_IPHONE_SIMULATOR && !TARGET_OS_EMBEDDED))
//================================================================================================ //================================================================================================
@ -943,7 +943,7 @@ const
kAudioUnitErr_InvalidParameterValue = -66743; kAudioUnitErr_InvalidParameterValue = -66743;
{$ifc TARGET_OS_IPHONE and not TARGET_OS_SIMULATOR} {$ifc TARGET_OS_IPHONE and not TARGET_IPHONE_SIMULATOR}
{! {!
@enum AudioComponent errors for inter-app audio @enum AudioComponent errors for inter-app audio
@ -968,7 +968,7 @@ const
kAudioComponentErr_NotPermitted = -66748; kAudioComponentErr_NotPermitted = -66748;
kAudioComponentErr_InitializationTimedOut = -66747; kAudioComponentErr_InitializationTimedOut = -66747;
kAudioComponentErr_InvalidFormat = -66746; kAudioComponentErr_InvalidFormat = -66746;
{$endc} {TARGET_OS_IPHONE and not TARGET_OS_SIMULATOR} {$endc} {TARGET_OS_IPHONE and not TARGET_IPHONE_SIMULATOR}
{! {!
@typedef AudioUnitPropertyID @typedef AudioUnitPropertyID
@ -1615,7 +1615,7 @@ function AudioUnitProcessMultiple( inUnit: AudioUnit; ioActionFlags: AudioUnitRe
function AudioUnitReset( inUnit: AudioUnit; inScope: AudioUnitScope; inElement: AudioUnitElement ): OSStatus; external name '_AudioUnitReset'; function AudioUnitReset( inUnit: AudioUnit; inScope: AudioUnitScope; inElement: AudioUnitElement ): OSStatus; external name '_AudioUnitReset';
(* API_AVAILABLE(macos(10.0), ios(2.0), watchos(2.0), tvos(9.0)) *) (* API_AVAILABLE(macos(10.0), ios(2.0), watchos(2.0), tvos(9.0)) *)
{$ifc TARGET_OS_IPHONE and not TARGET_OS_SIMULATOR} {$ifc TARGET_OS_IPHONE and not TARGET_IPHONE_SIMULATOR}
{! {!
@function AudioOutputUnitPublish @function AudioOutputUnitPublish
@ -1652,7 +1652,7 @@ function AudioOutputUnitPublish( const (*var*) inDesc: AudioComponentDescription
} }
function AudioComponentGetLastActiveTime( comp: AudioComponent ): CFAbsoluteTime; external name '_AudioComponentGetLastActiveTime'; function AudioComponentGetLastActiveTime( comp: AudioComponent ): CFAbsoluteTime; external name '_AudioComponentGetLastActiveTime';
(* API_AVAILABLE(ios(7.0), watchos(2.0), tvos(9.0)) API_UNAVAILABLE(macos) *) (* API_AVAILABLE(ios(7.0), watchos(2.0), tvos(9.0)) API_UNAVAILABLE(macos) *)
{$endc} {TARGET_OS_IPHONE and not TARGET_OS_SIMULATOR} {$endc} {TARGET_OS_IPHONE and not TARGET_IPHONE_SIMULATOR}
{$ifc TARGET_CPU_64 or TARGET_OS_IPHONE} {$ifc TARGET_CPU_64 or TARGET_OS_IPHONE}
{! {!

View File

@ -1308,6 +1308,7 @@ type
end; end;
AUHostVersionIdentifierPtr = ^AUHostVersionIdentifier; AUHostVersionIdentifierPtr = ^AUHostVersionIdentifier;
{$ifc TARGET_OS_MAC}
{ {
@typedef AUMIDIOutputCallback @typedef AUMIDIOutputCallback
@abstract A callback used by an audio unit to provide MIDI data to a host application @abstract A callback used by an audio unit to provide MIDI data to a host application
@ -1326,7 +1327,8 @@ type
userData: UnivPtr {__nullable}; userData: UnivPtr {__nullable};
end; end;
AUMIDIOutputCallbackStructPtr = ^AUMIDIOutputCallbackStruct; AUMIDIOutputCallbackStructPtr = ^AUMIDIOutputCallbackStruct;
{$endc TARGET_OS_MAC}
{! {!
@struct AUInputSamplesInOutputCallbackStruct @struct AUInputSamplesInOutputCallbackStruct
@abstract Used by a host when registering a callback with an audio unit, to provide @abstract Used by a host when registering a callback with an audio unit, to provide