Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2020-07-28 17:00:48 +0300
committerSebastian Dröge <sebastian@centricular.com>2020-07-28 18:52:11 +0300
commita022bbe260000d327c136af30774211d75795a01 (patch)
tree673ab46d61348c15f6d072fc2cdb728853c88e55 /audio
parent7255c1d204e2c208a4e00a61b6e9f34f47e30e24 (diff)
Fix some new clippy warnings
Diffstat (limited to 'audio')
-rw-r--r--audio/audiofx/src/audioecho.rs2
-rw-r--r--audio/csound/src/filter.rs12
2 files changed, 5 insertions, 9 deletions
diff --git a/audio/audiofx/src/audioecho.rs b/audio/audiofx/src/audioecho.rs
index 8fc1e7599..d2e1aedc5 100644
--- a/audio/audiofx/src/audioecho.rs
+++ b/audio/audiofx/src/audioecho.rs
@@ -290,7 +290,7 @@ impl BaseTransformImpl for AudioEcho {
}
let info = gst_audio::AudioInfo::from_caps(incaps)
- .or_else(|_| Err(gst_loggable_error!(CAT, "Failed to parse input caps")))?;
+ .map_err(|_| gst_loggable_error!(CAT, "Failed to parse input caps"))?;
let max_delay = self.settings.lock().unwrap().max_delay;
let size = max_delay * (info.rate() as u64) / gst::SECOND_VAL;
let buffer_size = size * (info.channels() as u64);
diff --git a/audio/csound/src/filter.rs b/audio/csound/src/filter.rs
index d6c56f91a..e25d199d4 100644
--- a/audio/csound/src/filter.rs
+++ b/audio/csound/src/filter.rs
@@ -592,19 +592,15 @@ impl BaseTransformImpl for CsoundFilter {
) -> Result<(), gst::LoggableError> {
// Flush previous state
if self.state.lock().unwrap().is_some() {
- self.drain(element).or_else(|e| {
- Err(gst_loggable_error!(
- CAT,
- "Error flusing previous state data {:?}",
- e
- ))
+ self.drain(element).map_err(|e| {
+ gst_loggable_error!(CAT, "Error flusing previous state data {:?}", e)
})?;
}
let in_info = gst_audio::AudioInfo::from_caps(incaps)
- .or_else(|_| Err(gst_loggable_error!(CAT, "Failed to parse input caps")))?;
+ .map_err(|_| gst_loggable_error!(CAT, "Failed to parse input caps"))?;
let out_info = gst_audio::AudioInfo::from_caps(outcaps)
- .or_else(|_| Err(gst_loggable_error!(CAT, "Failed to parse output caps")))?;
+ .map_err(|_| gst_loggable_error!(CAT, "Failed to parse output caps"))?;
let csound = self.csound.lock().unwrap();