Use objc2 crates
#128
Open
Use objc2 crates
#128
+287
−214
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
madsmtm
commented
Jan 26, 2025
Comment on lines
+20
to
+32
| pub mod sys { | ||
| #[cfg(feature = "audio_toolbox")] | ||
| pub use objc2_audio_toolbox::*; | ||
| #[cfg(feature = "core_audio")] | ||
| pub use objc2_core_audio::*; | ||
| #[cfg(feature = "core_audio")] | ||
| pub use objc2_core_audio_types::*; | ||
| #[cfg(feature = "core_midi")] | ||
| pub use objc2_core_midi::*; | ||
|
|
||
| // MacTypes.h | ||
| pub type OSStatus = i32; | ||
| } |
There was a problem hiding this comment.
I'm not a big fan of this module, ideally users should probably import the crates themselves, but it's useful to not break too much at once.
madsmtm
commented
Jan 26, 2025
Comment on lines
+52
to
63
| let mut audio_device_id: AudioDeviceID = 0; | ||
| let data_size = mem::size_of::<AudioDeviceID>() as u32; | ||
| let status = unsafe { | ||
| AudioObjectGetPropertyData( | ||
| kAudioObjectSystemObject, | ||
| &property_address as *const _, | ||
| kAudioObjectSystemObject as AudioObjectID, | ||
| NonNull::from(&property_address), | ||
| 0, | ||
| null(), | ||
| &data_size as *const _ as *mut _, | ||
| &audio_device_id as *const _ as *mut _, | ||
| NonNull::from(&data_size), | ||
| NonNull::from(&mut audio_device_id).cast(), | ||
| ) | ||
| }; |
There was a problem hiding this comment.
I made sure to use &mut on the out pointer audio_device_id here (and in similar cases below), this was UB before (AudioObjectGetPropertyData was writing through an immutable reference).
madsmtm
force-pushed
the
objc2
branch
2 times, most recently
from
e8b03fa to
8e5379e
Compare
This was referenced Jan 26, 2025
madsmtm
commented
Jan 26, 2025
Comment on lines
+34
to
+109
| objc2-core-foundation = { version = "0.3", optional = true, default-features = false, features = [ | ||
| "std", | ||
| "CFBase", | ||
| "CFString", | ||
| ] } | ||
| objc2-audio-toolbox = { version = "0.3", optional = true, default-features = false, features = [ | ||
| "std", | ||
| "bitflags", | ||
| "libc", | ||
| "objc2-core-foundation", | ||
| "AUAudioUnit", | ||
| "AUAudioUnitImplementation", | ||
| "AUCocoaUIView", | ||
| "AUComponent", | ||
| "AUGraph", | ||
| "AUParameters", | ||
| "AudioCodec", | ||
| "AudioComponent", | ||
| "AudioConverter", | ||
| "AudioFile", | ||
| "AudioFileStream", | ||
| "AudioFormat", | ||
| "AudioOutputUnit", | ||
| "AudioQueue", | ||
| "AudioServices", | ||
| "AudioSession", | ||
| "AudioUnit", | ||
| "AudioUnitCarbonView", | ||
| "AudioUnitParameters", | ||
| "AudioUnitProperties", | ||
| "AudioUnitUtilities", | ||
| "AudioWorkInterval", | ||
| "CAFFile", | ||
| "CAShow", | ||
| "DefaultAudioOutput", | ||
| "ExtendedAudioFile", | ||
| "MusicDevice", | ||
| "MusicPlayer", | ||
| "objc2-core-audio", | ||
| "objc2-core-audio-types", | ||
| ] } | ||
| objc2-core-audio = { version = "0.3", optional = true, default-features = false, features = [ | ||
| "std", | ||
| "objc2-core-audio-types", | ||
| "AudioHardware", | ||
| "AudioHardwareDeprecated", | ||
| "AudioServerPlugIn", | ||
| "HostTime", | ||
| ] } | ||
| objc2-core-audio-types = { version = "0.3", optional = true, default-features = false, features = [ | ||
| "std", | ||
| "bitflags", | ||
| "AudioSessionTypes", | ||
| "CoreAudioBaseTypes", | ||
| ] } | ||
| objc2-core-midi = { version = "0.3", optional = true, default-features = false, features = [ | ||
| "std", | ||
| "objc2-core-foundation", | ||
| "MIDIBluetoothConnection", | ||
| "MIDICIDevice", | ||
| "MIDICIDeviceManager", | ||
| "MIDICapabilityInquiry", | ||
| "MIDIDriver", | ||
| "MIDIMessages", | ||
| "MIDINetworkSession", | ||
| "MIDIServices", | ||
| "MIDISetup", | ||
| "MIDIThruConnection", | ||
| "MIDIUMPCI", | ||
| "MIDIUMPCIProfile", | ||
| "MIDIUMPEndpoint", | ||
| "MIDIUMPEndpointManager", | ||
| "MIDIUMPFunctionBlock", | ||
| "MIDIUMPMutableEndpoint", | ||
| "MIDIUMPMutableFunctionBlock", | ||
| ] } |
There was a problem hiding this comment.
It is unclear what features we want to enable here, so for now, I went with roughly "all features except block2 and objc2".
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use the
objc2-*crates instead ofcoreaudio-sys(you knew it was coming @simlay 😉):objc2-audio-toolbox.objc2-core-audio.objc2-core-audio-types.objc2-core-midi.Resolves every single
coreaudio-sysissue1 and PR by no longer invokingbindgen, and instead generating the headers ahead of time. We should probably deprecatecoreaudio-sysand archive the repo once this lands.The bindings generated by
objc2's toolheader-translatorare also a bit more type-safe as they include for example null-ability information, and is able to merge some enum constants into constants on the enum type.Tested with
sineexample on:Note: We've experienced problems with linking AudioUnix in the past, see RustAudio/coreaudio-sys#51, but that should be irrelevant since we now just always link AudioToolbox. This is fine, since AudioUnit has been an empty re-export of parts of AudioToolbox since macOS 10.10 (and
rustc's minimum supported macOS version is 10.12) 2.Note: I am unsure of your MSRV, but this will at least bump it to 1.71 (required for
extern "C-unwind").Footnotes
Okay, maybe Docs failed to build for 0.2.5. coreaudio-sys#40 isn't quite resolved, since
objc2-core-audioalso failed building docs, but that's a minor issue. ↩If you really want to, we could add
#[link(name = "AudioUnit", kind = "framework")] extern "C" {}to still support older macOS versions. ↩