Merge pull request #57 from mitchmindtree/update_sys

Update to coreaudio-sys 0.2. Rename reexport from bindings to sys. Publish 0.8.

Author: mitchmindtree

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "coreaudio-rs"
-version = "0.7.0"
+version = "0.8.0"
 authors = ["mitchmindtree <mitchell.nordine@gmail.com>", "yupferris <jake@fusetools.com>"]
 description = "A friendly rust interface for Apple's CoreAudio API."
 keywords = ["core", "audio", "unit", "osx", "ios"]
@@ -14,5 +14,4 @@ name = "coreaudio"
 
 [dependencies]
 bitflags = "1.0"
-coreaudio-sys = "0.1"
-libc = "0.2"
+coreaudio-sys = "0.2"

src/audio_unit/audio_format.rs

@@ -3,8 +3,7 @@
 //! See the Core Audio Data Types Reference
 //! [here](https://developer.apple.com/library/mac/documentation/MusicAudio/Reference/CoreAudioDataTypesRef/#//apple_ref/doc/constant_group/Audio_Data_Format_Identifiers) for more info.
 
-
-use libc;
+use std::os::raw::c_uint;
 
 /// A type-safe representation of both the `AudioFormatId` and their associated flags.
 #[derive(Copy, Clone, Debug)]
@@ -175,7 +174,7 @@ pub enum AudioFormat {
 impl AudioFormat {
 
     /// Convert from the FFI C format and flags to a typesafe Rust enum representation.
-    pub fn from_format_and_flag(format: libc::c_uint, flag: Option<u32>) -> Option<AudioFormat> {
+    pub fn from_format_and_flag(format: c_uint, flag: Option<u32>) -> Option<AudioFormat> {
         match (format, flag) {
             (1819304813, Some(i)) => Some(AudioFormat::LinearPCM(LinearPcmFlags::from_bits_truncate(i))),
             (1633889587, _)       => Some(AudioFormat::AC3),
@@ -218,7 +217,7 @@ impl AudioFormat {
     }
 
     /// Convert from the Rust enum to the C format and flag.
-    pub fn to_format_and_flag(&self) -> (libc::c_uint, Option<u32>) {
+    pub fn to_format_and_flag(&self) -> (c_uint, Option<u32>) {
         match *self {
             AudioFormat::LinearPCM(flag)      => (1819304813, Some(flag.bits())),
             AudioFormat::AC3                  => (1633889587, None),

src/audio_unit/mod.rs

@@ -19,11 +19,11 @@
 //! fixes!
 
 
-use bindings::audio_unit as au;
 use error::Error;
-use libc;
 use std::mem;
 use std::ptr;
+use std::os::raw::{c_uint, c_void};
+use sys;
 
 pub use self::audio_format::AudioFormat;
 pub use self::sample_format::{SampleFormat, Sample};
@@ -52,8 +52,14 @@ pub mod types;
 /// and [here](https://developer.apple.com/library/mac/documentation/MusicAudio/Conceptual/AudioUnitProgrammingGuide/TheAudioUnit/TheAudioUnit.html).
 #[derive(Copy, Clone, Debug)]
 pub enum Scope {
-    Output = 0,
+    Global = 0,
     Input  = 1,
+    Output = 2,
+    Group = 3,
+    Part = 4,
+    Note = 5,
+    Layer = 6,
+    LayerItem = 7,
 }
 
 /// Represents the **Input** and **Output** **Element**s.
@@ -66,11 +72,11 @@ pub enum Element {
 }
 
 
-/// A rust representation of the au::AudioUnit, including a pointer to the current rendering callback.
+/// A rust representation of the sys::AudioUnit, including a pointer to the current rendering callback.
 ///
 /// Find the original Audio Unit Programming Guide [here](https://developer.apple.com/library/mac/documentation/MusicAudio/Conceptual/AudioUnitProgrammingGuide/TheAudioUnit/TheAudioUnit.html).
 pub struct AudioUnit {
-    instance: au::AudioUnit,
+    instance: sys::AudioUnit,
     maybe_callback: Option<*mut render_callback::InputProcFnWrapper>
 }
 
@@ -112,17 +118,17 @@ impl AudioUnit {
     pub fn new_with_flags<T>(ty: T, flags: u32, mask: u32) -> Result<AudioUnit, Error>
         where T: Into<Type>,
     {
-        const MANUFACTURER_IDENTIFIER: u32 = au::kAudioUnitManufacturer_Apple;
+        const MANUFACTURER_IDENTIFIER: u32 = sys::kAudioUnitManufacturer_Apple;
         let au_type: Type = ty.into();
         let sub_type_u32 = match au_type.to_subtype_u32() {
             Some(u) => u,
             None => return Err(Error::NoKnownSubtype),
         };
 
         // A description of the audio unit we desire.
-        let desc = au::AudioComponentDescription {
-            componentType: au_type.to_u32() as libc::c_uint,
-            componentSubType: sub_type_u32 as libc::c_uint,
+        let desc = sys::AudioComponentDescription {
+            componentType: au_type.to_u32() as c_uint,
+            componentSubType: sub_type_u32 as c_uint,
             componentManufacturer: MANUFACTURER_IDENTIFIER,
             componentFlags: flags,
             componentFlagsMask: mask,
@@ -137,19 +143,19 @@ impl AudioUnit {
             // find the first system audio unit matching the description, using a system-defined
             // ordering. If you instead pass a previously found audio unit reference in this
             // parameter, the function locates the next audio unit matching the description.
-            let component = au::AudioComponentFindNext(ptr::null_mut(), &desc as *const _);
+            let component = sys::AudioComponentFindNext(ptr::null_mut(), &desc as *const _);
             if component.is_null() {
                 return Err(Error::NoMatchingDefaultAudioUnitFound);
             }
 
             // Create an instance of the default audio unit using the component.
-            let mut instance: au::AudioUnit = mem::uninitialized();
+            let mut instance: sys::AudioUnit = mem::uninitialized();
             try_os_status!(
-                au::AudioComponentInstanceNew(component, &mut instance as *mut au::AudioUnit)
+                sys::AudioComponentInstanceNew(component, &mut instance as *mut sys::AudioUnit)
             );
 
             // Initialise the audio unit!
-            try_os_status!(au::AudioUnitInitialize(instance));
+            try_os_status!(sys::AudioUnitInitialize(instance));
             Ok(AudioUnit {
                 instance: instance,
                 maybe_callback: None
@@ -178,14 +184,14 @@ impl AudioUnit {
         -> Result<(), Error>
     {
         let (data_ptr, size) = maybe_data.map(|data| {
-            let ptr = data as *const _ as *const libc::c_void;
+            let ptr = data as *const _ as *const c_void;
             let size = ::std::mem::size_of::<T>() as u32;
             (ptr, size)
         }).unwrap_or_else(|| (::std::ptr::null(), 0));
-        let scope = scope as libc::c_uint;
-        let elem = elem as libc::c_uint;
+        let scope = scope as c_uint;
+        let elem = elem as c_uint;
         unsafe {
-            try_os_status!(au::AudioUnitSetProperty(self.instance, id, scope, elem, data_ptr, size))
+            try_os_status!(sys::AudioUnitSetProperty(self.instance, id, scope, elem, data_ptr, size))
         }
         Ok(())
     }
@@ -201,15 +207,15 @@ impl AudioUnit {
     /// - **scope**: The audio unit scope for the property.
     /// - **elem**: The audio unit element for the property.
     pub fn get_property<T>(&self, id: u32, scope: Scope, elem: Element) -> Result<T, Error> {
-        let scope = scope as libc::c_uint;
-        let elem = elem as libc::c_uint;
+        let scope = scope as c_uint;
+        let elem = elem as c_uint;
         let mut size = ::std::mem::size_of::<T>() as u32;
         unsafe {
             let mut data: T = ::std::mem::uninitialized();
-            let data_ptr = &mut data as *mut _ as *mut libc::c_void;
+            let data_ptr = &mut data as *mut _ as *mut c_void;
             let size_ptr = &mut size as *mut _;
             try_os_status!(
-                au::AudioUnitGetProperty(self.instance, id, scope, elem, data_ptr, size_ptr)
+                sys::AudioUnitGetProperty(self.instance, id, scope, elem, data_ptr, size_ptr)
             );
             Ok(data)
         }
@@ -220,7 +226,7 @@ impl AudioUnit {
     ///
     /// **Available** in OS X v10.0 and later.
     pub fn start(&mut self) -> Result<(), Error> {
-        unsafe { try_os_status!(au::AudioOutputUnitStart(self.instance)); }
+        unsafe { try_os_status!(sys::AudioOutputUnitStart(self.instance)); }
         Ok(())
     }
 
@@ -229,21 +235,21 @@ impl AudioUnit {
     ///
     /// **Available** in OS X v10.0 and later.
     pub fn stop(&mut self) -> Result<(), Error> {
-        unsafe { try_os_status!(au::AudioOutputUnitStop(self.instance)); }
+        unsafe { try_os_status!(sys::AudioOutputUnitStop(self.instance)); }
         Ok(())
     }
 
     /// Set the **AudioUnit**'s sample rate.
     ///
     /// **Available** in iOS 2.0 and later.
     pub fn set_sample_rate(&mut self, sample_rate: f64) -> Result<(), Error> {
-        let id = au::kAudioUnitProperty_SampleRate;
+        let id = sys::kAudioUnitProperty_SampleRate;
         self.set_property(id, Scope::Input, Element::Output, Some(&sample_rate))
     }
 
     /// Get the **AudioUnit**'s sample rate.
     pub fn sample_rate(&self) -> Result<f64, Error> {
-        let id = au::kAudioUnitProperty_SampleRate;
+        let id = sys::kAudioUnitProperty_SampleRate;
         self.get_property(id, Scope::Input, Element::Output)
     }
 
@@ -262,14 +268,14 @@ impl AudioUnit {
     /// > - Mac audio units and other audio processing: Noninterleaved linear PCM with 32-bit
     /// floating-point
     pub fn set_stream_format(&mut self, stream_format: StreamFormat) -> Result<(), Error> {
-        let id = au::kAudioUnitProperty_StreamFormat;
+        let id = sys::kAudioUnitProperty_StreamFormat;
         let asbd = stream_format.to_asbd();
         self.set_property(id, Scope::Input, Element::Output, Some(&asbd))
     }
 
     /// Return the current Stream Format for the AudioUnit.
     pub fn stream_format(&self) -> Result<StreamFormat, Error> {
-        let id = au::kAudioUnitProperty_StreamFormat;
+        let id = sys::kAudioUnitProperty_StreamFormat;
         let asbd = try!(self.get_property(id, Scope::Output, Element::Output));
         StreamFormat::from_asbd(asbd)
     }
@@ -290,7 +296,7 @@ impl Drop for AudioUnit {
             // A user should explicitly terminate the `AudioUnit` if they want to handle errors (we
             // still need to provide a way to actually do that).
             self.stop().ok();
-            error::Error::from_os_status(au::AudioUnitUninitialize(self.instance)).ok();
+            error::Error::from_os_status(sys::AudioUnitUninitialize(self.instance)).ok();
 
             self.free_render_callback();
         }