From 0bdafdab9baaadca88094915772bd1150633e812 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Thu, 11 Dec 2014 19:02:04 +0100
Subject: [PATCH] Buffer now always has the u8 format

---
 examples/beep.rs  | 13 ++++++++-----
 src/lib.rs        | 17 ++++++++++-------
 src/wasapi/mod.rs | 24 ++++++++++++------------
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/examples/beep.rs b/examples/beep.rs
index 7215e9d..c43d1a7 100644
--- a/examples/beep.rs
+++ b/examples/beep.rs
@@ -15,14 +15,17 @@ fn main() {
                 let max: u16 = Int::max_value();
                 let value = (max as f32 / 2.0) + (angle * (max as f32 / 2.0));
                 value as u16
-            })
-            .map(|v| (v, v));
+            });
 
     loop {
-        let mut buffer = channel.append_data::<(u16, u16)>();
+        let mut buffer = channel.append_data();
 
-        for value in buffer.iter_mut() {
-            *value = data_source.next().unwrap();
+        for sample in buffer.chunks_mut(4) {
+            let value = data_source.next().unwrap();
+
+            let mut writer = std::io::BufWriter::new(sample);
+            writer.write_le_u16(value).unwrap();
+            writer.write_le_u16(value).unwrap();
         }
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
index a132599..8d9fcb6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -13,10 +13,13 @@ pub mod cpal_impl;
 /// stop playing.
 pub struct Channel(cpal_impl::Channel);
 
+/// Number of channels.
+pub type ChannelsCount = u16;
+
 /// Represents a buffer that must be filled with audio data.
 ///
 /// A `Buffer` object borrows the channel.
-pub struct Buffer<'a, T>(cpal_impl::Buffer<'a, T>);
+pub struct Buffer<'a>(cpal_impl::Buffer<'a>);
 
 impl Channel {
     pub fn new() -> Channel {
@@ -27,7 +30,7 @@ impl Channel {
     /// Returns the number of channels.
     ///
     /// 1 for mono, 2 for stereo, etc.
-    pub fn get_channels(&self) -> u16 {
+    pub fn get_channels(&self) -> ChannelsCount {
         self.0.get_channels()
     }
 
@@ -36,19 +39,19 @@ impl Channel {
     /// This function returns a `Buffer` object that must be filled with the audio data.
     /// You can't know in advance the size of the buffer, as it depends on the current state
     /// of the backend.
-    pub fn append_data<'a, T>(&'a mut self) -> Buffer<'a, T> {
+    pub fn append_data<'a>(&'a mut self) -> Buffer<'a> {
         Buffer(self.0.append_data())
     }
 }
 
-impl<'a, T> Deref<[T]> for Buffer<'a, T> {
-    fn deref(&self) -> &[T] {
+impl<'a> Deref<[u8]> for Buffer<'a> {
+    fn deref(&self) -> &[u8] {
         panic!()
     }
 }
 
-impl<'a, T> DerefMut<[T]> for Buffer<'a, T> {
-    fn deref_mut(&mut self) -> &mut [T] {
+impl<'a> DerefMut<[u8]> for Buffer<'a> {
+    fn deref_mut(&mut self) -> &mut [u8] {
         self.0.get_buffer()
     }
 }
diff --git a/src/wasapi/mod.rs b/src/wasapi/mod.rs
index 053f692..c146804 100644
--- a/src/wasapi/mod.rs
+++ b/src/wasapi/mod.rs
@@ -13,10 +13,10 @@ pub struct Channel {
     started: bool,
 }
 
-pub struct Buffer<'a, T> {
+pub struct Buffer<'a> {
     audio_client: *mut winapi::IAudioClient,
     render_client: *mut winapi::IAudioRenderClient,
-    buffer: CVec<T>,
+    buffer: CVec<u8>,
     frames: winapi::UINT32,
     start_on_drop: bool,
 }
@@ -26,13 +26,11 @@ impl Channel {
         init().unwrap()
     }
 
-    pub fn get_channels(&self) -> u16 {
-        self.num_channels as u16
+    pub fn get_channels(&self) -> ::ChannelsCount {
+        self.num_channels as ::ChannelsCount
     }
 
-    pub fn append_data<'a, T>(&'a mut self) -> Buffer<'a, T> {
-        assert!(mem::size_of::<T>() == self.bytes_per_frame as uint);
-
+    pub fn append_data<'a>(&'a mut self) -> Buffer<'a> {
         unsafe {
             loop {
                 // 
@@ -52,14 +50,16 @@ impl Channel {
                 }
 
                 // loading buffer
-                let buffer: CVec<T> = {
+                let buffer: CVec<u8> = {
                     let mut buffer: *mut winapi::BYTE = mem::uninitialized();
                     let f = self.render_client.as_mut().unwrap().lpVtbl.as_ref().unwrap().GetBuffer;
                     let hresult = f(self.render_client, frames_available,
                                     &mut buffer as *mut *mut libc::c_uchar);
                     check_result(hresult).unwrap();
                     assert!(!buffer.is_null());
-                    CVec::new(buffer as *mut T, frames_available as uint)
+
+                    CVec::new(buffer as *mut u8,
+                              frames_available as uint * self.bytes_per_frame as uint)
                 };
 
                 let buffer = Buffer {
@@ -77,14 +77,14 @@ impl Channel {
     }
 }
 
-impl<'a, T> Buffer<'a, T> {
-    pub fn get_buffer(&mut self) -> &mut [T] {
+impl<'a> Buffer<'a> {
+    pub fn get_buffer(&mut self) -> &mut [u8] {
         self.buffer.as_mut_slice()
     }
 }
 
 #[unsafe_destructor]
-impl<'a, T> Drop for Buffer<'a, T> {
+impl<'a> Drop for Buffer<'a> {
     fn drop(&mut self) {
         // releasing buffer
         unsafe {