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

Minor code improvements and crates bump

Browse source
This commit is contained in:
Roderick van Domburg 2021-03-27 21:13:14 +01:00
parent 74b2fea338
commit bfca1ec15e
5 changed files with 31 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

25
playback/src/audio_backend/portaudio.rs
View file

@ -98,7 +98,7 @@ impl<'a> Open for PortAudioSink<'a> {
impl<'a> Sink for PortAudioSink<'a> {
fn start(&mut self) -> io::Result<()> {
macro_rules! start_sink {
($stream: ident, $parameters: ident) => {{
(ref mut $stream: ident, ref $parameters: ident) => {{
if $stream.is_none() {
*$stream = Some(
Stream::open(
@ -115,10 +115,11 @@ impl<'a> Sink for PortAudioSink<'a> {
$stream.as_mut().unwrap().start().unwrap()
}};
}
match self {
Self::F32(stream, parameters) => start_sink!(stream, parameters),
Self::S32(stream, parameters) => start_sink!(stream, parameters),
Self::S16(stream, parameters) => start_sink!(stream, parameters),
Self::F32(stream, parameters) => start_sink!(ref mut stream, ref parameters),
Self::S32(stream, parameters) => start_sink!(ref mut stream, ref parameters),
Self::S16(stream, parameters) => start_sink!(ref mut stream, ref parameters),
};
Ok(())
@ -126,15 +127,15 @@ impl<'a> Sink for PortAudioSink<'a> {
fn stop(&mut self) -> io::Result<()> {
macro_rules! stop_sink {
($stream: expr) => {{
(ref mut $stream: ident) => {{
$stream.as_mut().unwrap().stop().unwrap();
*$stream = None;
}};
}
match self {
Self::F32(stream, _parameters) => stop_sink!(stream),
Self::S32(stream, _parameters) => stop_sink!(stream),
Self::S16(stream, _parameters) => stop_sink!(stream),
Self::F32(stream, _parameters) => stop_sink!(ref mut stream),
Self::S32(stream, _parameters) => stop_sink!(ref mut stream),
Self::S16(stream, _parameters) => stop_sink!(ref mut stream),
};
Ok(())
@ -142,7 +143,7 @@ impl<'a> Sink for PortAudioSink<'a> {
fn write(&mut self, packet: &AudioPacket) -> io::Result<()> {
macro_rules! write_sink {
($stream: expr, $samples: expr) => {
(ref mut $stream: expr, $samples: expr) => {
$stream.as_mut().unwrap().write($samples)
};
}
@ -150,15 +151,15 @@ impl<'a> Sink for PortAudioSink<'a> {
let samples = packet.samples();
let result = match self {
Self::F32(stream, _parameters) => {
write_sink!(stream, samples)
write_sink!(ref mut stream, samples)
}
Self::S32(stream, _parameters) => {
let samples_s32: &[i32] = &SamplesConverter::to_s32(samples);
write_sink!(stream, samples_s32)
write_sink!(ref mut stream, samples_s32)
}
Self::S16(stream, _parameters) => {
let samples_s16: &[i16] = &SamplesConverter::to_s16(samples);
write_sink!(stream, samples_s16)
write_sink!(ref mut stream, samples_s16)
}
};
match result {

12
playback/src/audio_backend/rodio.rs
View file

@ -27,14 +27,14 @@ macro_rules! rodio_sink {
match self.format {
AudioFormat::F32 => {
let source = rodio::buffer::SamplesBuffer::new(NUM_CHANNELS as u16, SAMPLE_RATE, samples);
self.rodio_sink.append(source)
self.rodio_sink.append(source);
},
AudioFormat::S16 => {
let samples_s16: &[i16] = &SamplesConverter::to_s16(samples);
let source = rodio::buffer::SamplesBuffer::new(NUM_CHANNELS as u16, SAMPLE_RATE, samples_s16);
self.rodio_sink.append(source)
self.rodio_sink.append(source);
},
_ => unimplemented!(),
_ => unreachable!(),
};
// Chunk sizes seem to be about 256 to 3000 ish items long.
@ -64,15 +64,15 @@ macro_rules! rodio_sink {
let rodio_device = match_device(&host, device);
debug!("Using cpal device");
let stream = rodio::OutputStream::try_from_device(&rodio_device)
let (stream, stream_handle) = rodio::OutputStream::try_from_device(&rodio_device)
.expect("couldn't open output stream.");
debug!("Using Rodio stream");
let sink = rodio::Sink::try_new(&stream.1).expect("couldn't create output sink.");
let sink = rodio::Sink::try_new(&stream_handle).expect("couldn't create output sink.");
debug!("Using Rodio sink");
Self {
rodio_sink: sink,
stream: stream.0,
stream: stream,
format: format,
}
}