yetangitu/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2025-10-06 03:50:06 +02:00
Code Issues Releases Wiki Activity

Add initial support for alsamixer

Browse source
This commit is contained in:
ashthespy 2018-03-20 16:32:43 +01:00
parent a41ab28540
commit a67048c3d7
6 changed files with 108 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

50
playback/src/audio_backend/alsa.rs
View file

@ -1,11 +1,14 @@
use super::{Open, Sink};
use alsa::{Access, Format, Mode, Stream, PCM};
use std::io;
use std::ffi::CString;
use alsa::{Direction, ValueOr};
use alsa::pcm::{PCM, HwParams, Format, Access};
pub struct AlsaSink(Option<PCM>, String);
impl Open for AlsaSink {
fn open(device: Option<String>) -> AlsaSink {
fn open(device: Option<String>) -> AlsaSink {
info!("Using alsa sink");
let name = device.unwrap_or("default".to_string());
@ -16,26 +19,24 @@ impl Open for AlsaSink {
impl Sink for AlsaSink {
fn start(&mut self) -> io::Result<()> {
if self.0.is_none() {
match PCM::open(
&*self.1,
Stream::Playback,
Mode::Blocking,
Format::Signed16,
Access::Interleaved,
2,
44100,
) {
Ok(f) => self.0 = Some(f),
Err(e) => {
error!("Alsa error PCM open {}", e);
return Err(io::Error::new(
io::ErrorKind::Other,
"Alsa error: PCM open failed",
));
}
if self.0.is_some() {
} else {
let pcm = PCM::open(&*CString::new(self.1.to_owned().into_bytes()).unwrap(),
Direction::Playback,
false).unwrap();
{
// Set hardware parameters: 44100 Hz / Stereo / 16 bit
let hwp = HwParams::any(&pcm).unwrap();
hwp.set_channels(2).unwrap();
hwp.set_rate(44100, ValueOr::Nearest).unwrap();
hwp.set_format(Format::s16()).unwrap();
hwp.set_access(Access::RWInterleaved).unwrap();
pcm.hw_params(&hwp).unwrap();
}
self.0 = Some(pcm);
}
Ok(())
}
@ -45,7 +46,14 @@ impl Sink for AlsaSink {
}
fn write(&mut self, data: &[i16]) -> io::Result<()> {
self.0.as_mut().unwrap().write_interleaved(&data).unwrap();
let pcm = self.0.as_mut().unwrap();
let io = pcm.io_i16().unwrap();
match io.writei(&data) {
Ok(_) => (),
Err(err) => pcm.recover(err.code(), false).unwrap(),
}
Ok(())
}
}