rob
/
cpal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use the correct device name when enumerating formats

This commit is contained in:
Pierre Krieger 2015-09-22 15:12:41 +02:00
parent 73906885f9
commit a2b8b4f4a7
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/alsa/mod.rs
View File

@ -27,7 +27,8 @@ impl Endpoint {
{ {
unsafe { unsafe {
let mut playback_handle = mem::uninitialized(); let mut playback_handle = mem::uninitialized();
check_errors(alsa::snd_pcm_open(&mut playback_handle, b"hw\0".as_ptr() as *const _, let device_name = ffi::CString::new(self.0.clone()).unwrap();
check_errors(alsa::snd_pcm_open(&mut playback_handle, device_name.as_ptr() as *const _,
alsa::SND_PCM_STREAM_PLAYBACK, alsa::SND_PCM_STREAM_PLAYBACK,
alsa::SND_PCM_NONBLOCK)).unwrap(); alsa::SND_PCM_NONBLOCK)).unwrap();
@ -89,8 +90,8 @@ impl Endpoint {
let samples_rates = if min_rate == max_rate { let samples_rates = if min_rate == max_rate {
vec![min_rate] vec![min_rate]
} else if alsa::snd_pcm_hw_params_test_rate(playback_handle, hw_params.0, min_rate + 1, 0) == 0 { /*} else if alsa::snd_pcm_hw_params_test_rate(playback_handle, hw_params.0, min_rate + 1, 0) == 0 {
(min_rate .. max_rate + 1).collect() (min_rate .. max_rate + 1).collect()*/ // TODO: code is correct but returns lots of stuff
} else { } else {
const RATES: [libc::c_uint; 13] = [ const RATES: [libc::c_uint; 13] = [
5512, 5512,
@ -115,11 +116,11 @@ impl Endpoint {
} }
} }
if rates.len() == 0 { /*if rates.len() == 0 {
(min_rate .. max_rate + 1).collect() (min_rate .. max_rate + 1).collect()
} else { } else {*/
rates rates // TODO: code is correct but returns lots of stuff
} //}
}; };
let mut min_channels = mem::uninitialized(); let mut min_channels = mem::uninitialized();