From 838855b3599c57954cc62e459ffe12b7da6a7a4d Mon Sep 17 00:00:00 2001 From: JasonLG1979 Date: Thu, 22 Jun 2023 00:45:32 -0500 Subject: [PATCH] Fix clippy lint --- playback/src/audio_backend/portaudio.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/playback/src/audio_backend/portaudio.rs b/playback/src/audio_backend/portaudio.rs index f1978a0d6..9c6eb986d 100644 --- a/playback/src/audio_backend/portaudio.rs +++ b/playback/src/audio_backend/portaudio.rs @@ -2,7 +2,7 @@ use super::{Open, Sink, SinkError, SinkResult}; use crate::config::AudioFormat; use crate::convert::Converter; use crate::decoder::AudioPacket; -use crate::{NUM_CHANNELS, SAMPLE_RATE}; +use crate::NUM_CHANNELS; use portaudio_rs::device::{get_default_output_index, DeviceIndex, DeviceInfo}; use portaudio_rs::stream::*; use std::process::exit; @@ -141,9 +141,9 @@ impl<'a> Sink for PortAudioSink<'a> { }}; } match self { - Self::F32(stream, _) => stop_sink!(ref mut stream), - Self::S32(stream, _) => stop_sink!(ref mut stream), - Self::S16(stream, _) => stop_sink!(ref mut stream), + Self::F32(stream, _, _) => stop_sink!(ref mut stream), + Self::S32(stream, _, _) => stop_sink!(ref mut stream), + Self::S16(stream, _, _) => stop_sink!(ref mut stream), }; Ok(()) @@ -161,15 +161,15 @@ impl<'a> Sink for PortAudioSink<'a> { .map_err(|e| SinkError::OnWrite(e.to_string()))?; let result = match self { - Self::F32(stream, _parameters) => { + Self::F32(stream, _parameters, _sample_rate) => { let samples_f32: &[f32] = &converter.f64_to_f32(samples); write_sink!(ref mut stream, samples_f32) } - Self::S32(stream, _parameters) => { + Self::S32(stream, _parameters, _sample_rate) => { let samples_s32: &[i32] = &converter.f64_to_s32(samples); write_sink!(ref mut stream, samples_s32) } - Self::S16(stream, _parameters) => { + Self::S16(stream, _parameters, _sample_rate) => { let samples_s16: &[i16] = &converter.f64_to_s16(samples); write_sink!(ref mut stream, samples_s16) }