github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-12-18 17:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1 from ipha/pulseaudio_stop_sink

Browse source 
Stop pulseaudio sink when not in use
This commit is contained in:
ComlOnline 2017-11-18 23:26:16 +00:00 committed by GitHub
commit 74964d8087
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/audio_backend/pulseaudio.rs
View file

@ -5,7 +5,12 @@ use std::ptr::{null, null_mut};
use std::mem::{transmute}; use std::mem::{transmute};
use std::ffi::CString; use std::ffi::CString;
pub struct PulseAudioSink(*mut pa_simple); pub struct PulseAudioSink {
s : *mut pa_simple,
ss : pa_sample_spec,
name : CString,
desc : CString
}
impl Open for PulseAudioSink { impl Open for PulseAudioSink {
fn open(device: Option<String>) -> PulseAudioSink { fn open(device: Option<String>) -> PulseAudioSink {
@ -24,30 +29,40 @@ impl Open for PulseAudioSink {
let name = CString::new("librespot").unwrap(); let name = CString::new("librespot").unwrap();
let description = CString::new("A spoty client library").unwrap(); let description = CString::new("A spoty client library").unwrap();
let s = unsafe { PulseAudioSink {
pa_simple_new(null(), // Use the default server. s: null_mut(),
name.as_ptr(), // Our application's name. ss: ss,
PA_STREAM_PLAYBACK, name: name,
null(), // Use the default device. desc: description
description.as_ptr(), // Description of our stream. }
&ss, // Our sample format.
null(), // Use default channel map
null(), // Use default buffering attributes.
null_mut(), // Ignore error code.
)
};
assert!(s != null_mut());
PulseAudioSink(s)
} }
} }
impl Sink for PulseAudioSink { impl Sink for PulseAudioSink {
fn start(&mut self) -> io::Result<()> { fn start(&mut self) -> io::Result<()> {
if self.s == null_mut() {
self.s = unsafe {
pa_simple_new(null(), // Use the default server.
self.name.as_ptr(), // Our application's name.
PA_STREAM_PLAYBACK,
null(), // Use the default device.
self.desc.as_ptr(), // desc of our stream.
&self.ss, // Our sample format.
null(), // Use default channel map
null(), // Use default buffering attributes.
null_mut(), // Ignore error code.
)
};
assert!(self.s != null_mut());
}
Ok(()) Ok(())
} }
fn stop(&mut self) -> io::Result<()> { fn stop(&mut self) -> io::Result<()> {
unsafe {
pa_simple_free(self.s);
}
self.s = null_mut();
Ok(()) Ok(())
} }
@ -55,13 +70,9 @@ impl Sink for PulseAudioSink {
unsafe { unsafe {
let ptr = transmute(data.as_ptr()); let ptr = transmute(data.as_ptr());
let bytes = data.len() as usize * 2; let bytes = data.len() as usize * 2;
pa_simple_write(self.0, ptr, bytes, null_mut()); pa_simple_write(self.s, ptr, bytes, null_mut());
}; };
Ok(()) Ok(())
} }
} }