Update for Rustc

This commit is contained in:
Pierre Krieger 2015-01-08 20:34:27 +01:00
parent 420a0f0fd4
commit 23e1e0639c
5 changed files with 87 additions and 81 deletions

View file

@ -1,7 +1,7 @@
extern crate "alsa-sys" as alsa;
extern crate libc;
use std::{mem, ptr};
use std::{ffi, iter, mem};
pub struct Voice {
channel: *mut alsa::snd_pcm_t,
@ -16,10 +16,10 @@ pub struct Buffer<'a, T> {
impl Voice {
pub fn new() -> Voice {
unsafe {
let name = "default".to_c_str();
let name = ffi::CString::from_slice(b"default");
let mut playback_handle = mem::uninitialized();
check_errors(alsa::snd_pcm_open(&mut playback_handle, name.as_ptr(), alsa::SND_PCM_STREAM_PLAYBACK, alsa::SND_PCM_NONBLOCK)).unwrap();
check_errors(alsa::snd_pcm_open(&mut playback_handle, name.as_slice_with_nul().as_ptr(), alsa::SND_PCM_STREAM_PLAYBACK, alsa::SND_PCM_NONBLOCK)).unwrap();
let mut hw_params = mem::uninitialized();
check_errors(alsa::snd_pcm_hw_params_malloc(&mut hw_params)).unwrap();
@ -60,7 +60,7 @@ impl Voice {
Buffer {
channel: self,
buffer: Vec::from_elem(elements, unsafe { mem::uninitialized() })
buffer: iter::repeat(unsafe { mem::uninitialized() }).take(elements).collect(),
}
}
@ -106,12 +106,12 @@ impl<'a, T> Buffer<'a, T> {
}
fn check_errors(err: libc::c_int) -> Result<(), String> {
use std::c_str::CString;
use std::ffi;
if err < 0 {
unsafe {
let s = CString::new(alsa::snd_strerror(err), false);
return Err(s.to_string());
let s = String::from_utf8(ffi::c_str_to_bytes(&alsa::snd_strerror(err)).to_vec());
return Err(s.unwrap());
}
}

View file

@ -47,8 +47,6 @@ a conversion on your data.
If you have the possibility, you should try to match the format of the voice.
*/
#![feature(associated_types)]
#![feature(macro_rules)]
#![feature(unsafe_destructor)]
#![unstable]

View file

@ -1,8 +1,7 @@
extern crate libc;
extern crate winapi;
use std::{mem, ptr};
use std::c_vec::CVec;
use std::{slice, mem, ptr};
// TODO: determine if should be NoSend or not
pub struct Voice {
@ -18,7 +17,8 @@ pub struct Voice {
pub struct Buffer<'a, T> {
render_client: *mut winapi::IAudioRenderClient,
buffer: CVec<T>,
buffer_data: *mut T,
buffer_len: uint,
frames: winapi::UINT32,
}
@ -67,7 +67,7 @@ impl Voice {
assert!(frames_available != 0);
// loading buffer
let buffer: CVec<T> = {
let (buffer_data, buffer_len) = {
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,
@ -75,14 +75,15 @@ impl Voice {
check_result(hresult).unwrap();
assert!(!buffer.is_null());
CVec::new(buffer as *mut T,
frames_available as uint * self.bytes_per_frame as uint
/ mem::size_of::<T>())
(buffer as *mut T,
frames_available as uint * self.bytes_per_frame as uint
/ mem::size_of::<T>())
};
let buffer = Buffer {
render_client: self.render_client,
buffer: buffer,
buffer_data: buffer_data,
buffer_len: buffer_len,
frames: frames_available,
};
@ -137,7 +138,9 @@ impl Drop for Voice {
impl<'a, T> Buffer<'a, T> {
pub fn get_buffer<'b>(&'b mut self) -> &'b mut [T] {
self.buffer.as_mut_slice()
unsafe {
slice::from_raw_mut_buf(&self.buffer_data, self.buffer_len)
}
}
pub fn finish(self) {