encounter/rust-sdl2
0
0
Fork 0
mirror of https://github.com/encounter/rust-sdl2.git synced 2026-07-10 21:18:41 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AngryLawyer/rust-sdl2

Browse Source
This commit is contained in:
Greg M
2014-05-11 18:41:52 -04:00
parent a7bbc5b2fe f85bec834e
commit 29bb632899
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sdl2/audio.rs
+3 -3
View File
@@ -204,7 +204,7 @@ pub struct AudioSpec<'a > {
pub padding: uint16_t,
pub size: uint32_t,
c_callback: ll::SDL_AudioCallback,
pub callback: &'a |&mut [u8]|:'a, // same size as *c_void
pub callback: Option<&'a |&mut [u8]|:'a>, // same size as *c_void
}
extern "C" fn c_audio_callback(userdata: *c_void, stream: *uint8_t, len: c_int) {
@@ -262,9 +262,9 @@ impl AudioDevice {
}
}
pub fn open(device: Option<&str>, iscapture: int, spec: &AudioSpec) -> Result<(AudioDevice, ~AudioSpec), ~str> {
pub fn open(device: Option<&str>, iscapture: int, spec: &AudioSpec) -> Result<(AudioDevice, AudioSpec), ~str> {
//! SDL_OpenAudioDevice
let obtained = ~unsafe { mem::uninit::<AudioSpec>() };
let obtained = unsafe { mem::uninit::<AudioSpec>() };
unsafe {
let device_c_str = match device {
None => ptr::null(),