Fixup tests and examples.

Author: tari

Cargo.toml

@@ -1,7 +1,7 @@
 
 [package]
 name = "ao"
-version = "0.6.0"
+version = "0.6.1"
 authors = [ "[email protected]" ]
 license = "BSD-2-Clause"
 

src/auto.rs

@@ -10,19 +10,17 @@
 //! use ao::auto::{SampleBuffer, AutoFormatDevice};
 //! use std::error::Error;
 //!
-//! struct Stereo(u16, u16);
+//! struct StereoBuffer(Vec<(i16, i16)>);
 //! 
-//! impl<'z> SampleBuffer for &'z [Stereo] {
+//! impl<'z> SampleBuffer for StereoBuffer {
 //!     fn channels(&self) -> usize { 2 }
 //!     fn sample_rate(&self) -> usize { 44100 }
 //!     fn endianness(&self) -> ao::Endianness { ao::Endianness::Native }
 //!     fn sample_width(&self) -> usize { 16 }
 //!     fn data<'a>(&self) -> &'a [u8] { 
 //!         unsafe {
-//!             ::std::mem::transmute(::std::raw::Slice {
-//!                 data: self.as_ptr() as *const u8,
-//!                 len: self.len() * 4
-//!             })
+//!             std::slice::from_raw_parts(self.0.as_ptr() as *const u8,
+//!                                        self.0.len() * 4)
 //!         }
 //!     }
 //! }
@@ -32,8 +30,8 @@
 //!     let driver = lib.get_driver("").expect("No default driver available");
 //!     let mut device = AutoFormatDevice::new(driver, vec!["", "L", "L,R"]);
 //!
-//!     let data = vec![Stereo(16383, -16383)];
-//!     match device.play(&data.as_slice()) {
+//!     let data = StereoBuffer(vec![(16383, -16383)]);
+//!     match device.play(&data) {
 //!         Ok(_) => (),
 //!         Err(e) => println!("Playback failed: {}", e.description())
 //!     }

src/lib.rs

@@ -23,13 +23,13 @@
 //!     
 //! }
 //!
-//! fn play_sinusoid<S: Str>(driver: Driver, format: SampleFormat<i16, S>) {
+//! fn play_sinusoid<S: AsRef<str>>(driver: Driver, format: SampleFormat<i16, S>) {
 //!     match driver.open_file(&format, &Path::new("out.wav"), false) {
 //!         Ok(d) => {
 //!             let samples: Vec<i16> = (0..44100).map(|i| {
 //!                 ((1.0 / 44100.0 / 440.0 * i as f32).sin() * 32767.0) as i16
 //!             }).collect();
-//!             d.play(samples.as_slice());
+//!             d.play(&samples);
 //!         }
 //!         Err(e) => {
 //!             println!("Failed to open output file: {}", e.description());