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

Fix clippy comparison chain warning (#857)

Browse source
This commit is contained in:
Jason Gray 2021-10-04 13:59:18 -05:00 committed by GitHub
parent 8d70fd910e
commit 4c1b2278ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,7 @@ use alsa::device_name::HintIter;
use alsa::pcm::{Access, Format, HwParams, PCM}; use alsa::pcm::{Access, Format, HwParams, PCM};
use alsa::{Direction, ValueOr}; use alsa::{Direction, ValueOr};
use std::cmp::min; use std::cmp::min;
use std::cmp::Ordering;
use std::process::exit; use std::process::exit;
use std::time::Duration; use std::time::Duration;
use thiserror::Error; use thiserror::Error;
@ -92,7 +93,7 @@ fn list_outputs() -> SinkResult<()> {
for t in &["pcm", "ctl", "hwdep"] { for t in &["pcm", "ctl", "hwdep"] {
println!("{} devices:", t); println!("{} devices:", t);
let i = HintIter::new_str(None, &t).map_err(|_| AlsaError::Parsing)?; let i = HintIter::new_str(None, t).map_err(|_| AlsaError::Parsing)?;
for a in i { for a in i {
if let Some(Direction::Playback) = a.direction { if let Some(Direction::Playback) = a.direction {
@ -225,14 +226,16 @@ impl Sink for AlsaSink {
let (pcm, bytes_per_period) = open_device(&self.device, self.format)?; let (pcm, bytes_per_period) = open_device(&self.device, self.format)?;
self.pcm = Some(pcm); self.pcm = Some(pcm);
let current_capacity = self.period_buffer.capacity(); match self.period_buffer.capacity().cmp(&bytes_per_period) {
Ordering::Greater => {
if current_capacity > bytes_per_period { self.period_buffer.truncate(bytes_per_period);
self.period_buffer.truncate(bytes_per_period); self.period_buffer.shrink_to_fit();
self.period_buffer.shrink_to_fit(); }
} else if current_capacity < bytes_per_period { Ordering::Less => {
let extra = bytes_per_period - self.period_buffer.len(); let extra = bytes_per_period - self.period_buffer.len();
self.period_buffer.reserve_exact(extra); self.period_buffer.reserve_exact(extra);
}
Ordering::Equal => (),
} }
// Should always match the "Period Buffer size in bytes: " trace! message. // Should always match the "Period Buffer size in bytes: " trace! message.
@ -251,11 +254,10 @@ impl Sink for AlsaSink {
self.period_buffer.resize(self.period_buffer.capacity(), 0); self.period_buffer.resize(self.period_buffer.capacity(), 0);
self.write_buf()?; self.write_buf()?;
let pcm = self.pcm.as_mut().ok_or(AlsaError::NotConnected)?; let pcm = self.pcm.take().ok_or(AlsaError::NotConnected)?;
pcm.drain().map_err(AlsaError::DrainFailure)?; pcm.drain().map_err(AlsaError::DrainFailure)?;
self.pcm = None;
Ok(()) Ok(())
} }