Remove re-exported sys module

Users should import the types they need from the objc2-* crates instead.
This should lower compile-times, since we need to compile a lot less.

Author: madsmtm

Cargo.toml

@@ -18,9 +18,14 @@ name = "coreaudio"
 
 [features]
 default = ["audio_toolbox", "core_audio"]
-audio_toolbox = ["dep:objc2-audio-toolbox", "dep:objc2-core-foundation"]
+audio_toolbox = [
+    "dep:objc2-audio-toolbox",
+    "dep:objc2-core-foundation",
+    "dep:objc2-core-audio",
+    "dep:objc2-core-audio-types",
+]
 core_audio = ["dep:objc2-core-audio", "dep:objc2-core-audio-types"]
-core_midi = ["dep:objc2-core-midi"]
+core_midi = []
 
 # Deprecated
 audio_unit = ["audio_toolbox"]
@@ -33,80 +38,32 @@ bitflags = "1.0"
 libc = "0.2"
 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",
+    "objc2-core-audio",
+    "objc2-core-audio-types",
     "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",
+    "AudioSession",
 ] }
 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",
-] }
 
 [package.metadata.docs.rs]
 all-features = true

examples/feedback.rs

@@ -9,7 +9,7 @@ use coreaudio::audio_unit::audio_format::LinearPcmFlags;
 use coreaudio::audio_unit::macos_helpers::{audio_unit_from_device_id, get_default_device_id};
 use coreaudio::audio_unit::render_callback::{self, data};
 use coreaudio::audio_unit::{Element, SampleFormat, Scope, StreamFormat};
-use coreaudio::sys::*;
+use objc2_audio_toolbox::kAudioUnitProperty_StreamFormat;
 
 const SAMPLE_RATE: f64 = 44100.0;
 

examples/feedback_interleaved.rs

@@ -11,7 +11,7 @@ use coreaudio::audio_unit::macos_helpers::{
 };
 use coreaudio::audio_unit::render_callback::{self, data};
 use coreaudio::audio_unit::{Element, SampleFormat, Scope, StreamFormat};
-use coreaudio::sys::*;
+use objc2_audio_toolbox::kAudioUnitProperty_StreamFormat;
 
 const SAMPLE_RATE: f64 = 44100.0;
 

examples/ios/Cargo.toml

@@ -12,4 +12,11 @@ crate-type = ["staticlib"]
 
 [dependencies]
 coreaudio-rs = { path = "../.." }
-
+objc2-audio-toolbox = { version = "0.3", default-features = false, features = [
+    "std",
+    "AudioUnitProperties",
+] }
+objc2-core-audio-types = { version = "0.3", default-features = false, features = [
+    "std",
+    "CoreAudioBaseTypes",
+] }

examples/ios/src/feedback.rs

@@ -8,7 +8,8 @@ use std::sync::{Arc, Mutex};
 use coreaudio::audio_unit::audio_format::LinearPcmFlags;
 use coreaudio::audio_unit::render_callback::{self, data};
 use coreaudio::audio_unit::{AudioUnit, Element, SampleFormat, Scope, StreamFormat};
-use coreaudio::sys::*;
+use objc2_audio_toolbox::{kAudioOutputUnitProperty_EnableIO, kAudioUnitProperty_StreamFormat};
+use objc2_core_audio_types::AudioStreamBasicDescription;
 
 type S = f32;
 const SAMPLE_FORMAT: SampleFormat = SampleFormat::F32;
@@ -36,8 +37,10 @@ pub fn run_example() -> Result<(), coreaudio::Error> {
         SampleFormat::F32 => LinearPcmFlags::IS_FLOAT,
         SampleFormat::I32 | SampleFormat::I16 | SampleFormat::I8 => {
             LinearPcmFlags::IS_SIGNED_INTEGER
-        },
-        SampleFormat::I24 => { unimplemented!("Not implemented for I24")},
+        }
+        SampleFormat::I24 => {
+            unimplemented!("Not implemented for I24")
+        }
     };
 
     // Using IS_NON_INTERLEAVED everywhere because data::Interleaved is commented out / not implemented

examples/sine_advanced.rs

@@ -11,7 +11,7 @@ use coreaudio::audio_unit::macos_helpers::{
 };
 use coreaudio::audio_unit::render_callback::{self, data};
 use coreaudio::audio_unit::{Element, SampleFormat, Scope, StreamFormat};
-use coreaudio::sys::kAudioUnitProperty_StreamFormat;
+use objc2_audio_toolbox::kAudioUnitProperty_StreamFormat;
 use std::f64::consts::PI;
 use std::process;
 

src/audio_unit/macos_helpers.rs

@@ -10,7 +10,11 @@ use std::sync::Mutex;
 use std::time::Duration;
 use std::{mem, thread};
 
-use crate::sys::{
+use libc::pid_t;
+use objc2_audio_toolbox::{
+    kAudioOutputUnitProperty_CurrentDevice, kAudioOutputUnitProperty_EnableIO,
+};
+use objc2_core_audio::{
     kAudioDevicePropertyAvailableNominalSampleRates, kAudioDevicePropertyDeviceIsAlive,
     kAudioDevicePropertyDeviceNameCFString, kAudioDevicePropertyHogMode,
     kAudioDevicePropertyNominalSampleRate, kAudioDevicePropertyScopeOutput,
@@ -19,22 +23,20 @@ use crate::sys::{
     kAudioHardwarePropertyDevices, kAudioObjectPropertyElementMaster,
     kAudioObjectPropertyElementWildcard, kAudioObjectPropertyScopeGlobal,
     kAudioObjectPropertyScopeInput, kAudioObjectPropertyScopeOutput, kAudioObjectSystemObject,
-    kAudioOutputUnitProperty_CurrentDevice, kAudioOutputUnitProperty_EnableIO,
     kAudioStreamPropertyAvailablePhysicalFormats, kAudioStreamPropertyPhysicalFormat,
     AudioDeviceID, AudioObjectAddPropertyListener, AudioObjectGetPropertyData,
     AudioObjectGetPropertyDataSize, AudioObjectID, AudioObjectPropertyAddress,
-    AudioObjectPropertyScope, AudioObjectRemovePropertyListener, AudioObjectSetPropertyData,
-    AudioStreamBasicDescription, AudioStreamRangedDescription, AudioValueRange, OSStatus,
+    AudioObjectPropertyListenerProc, AudioObjectPropertyScope, AudioObjectRemovePropertyListener,
+    AudioObjectSetPropertyData, AudioStreamRangedDescription,
 };
-use libc::pid_t;
-use objc2_core_audio::AudioObjectPropertyListenerProc;
+use objc2_core_audio_types::{AudioBufferList, AudioStreamBasicDescription, AudioValueRange};
 use objc2_core_foundation::CFString;
 
 use crate::audio_unit::audio_format::{AudioFormat, LinearPcmFlags};
 use crate::audio_unit::sample_format::SampleFormat;
 use crate::audio_unit::stream_format::StreamFormat;
 use crate::audio_unit::{AudioUnit, Element, IOType, Scope};
-use crate::sys;
+use crate::OSStatus;
 
 /// Helper function to get the device id of the default input or output device.
 pub fn get_default_device_id(input: bool) -> Option<AudioDeviceID> {
@@ -236,7 +238,7 @@ pub fn get_audio_device_supports_scope(devid: AudioDeviceID, scope: Scope) -> Re
     try_status_or_return!(status);
 
     let mut bfrs: Vec<u8> = Vec::with_capacity(data_size as usize);
-    let buffers = bfrs.as_mut_ptr() as *mut sys::AudioBufferList;
+    let buffers = bfrs.as_mut_ptr() as *mut AudioBufferList;
     unsafe {
         let status = AudioObjectGetPropertyData(
             devid,