diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2023-02-13 12:50:57 +0300 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2023-02-13 12:50:57 +0300 |
commit | 04e101c605cf93642f3ebc837ec0dbcc9b4e93d0 (patch) | |
tree | d3796e85fc308f847dfc1dd032e04d3234c98584 /audio | |
parent | 034c0f0fd8f9c87bea0bddf50179cbe5257dfe85 (diff) |
Optimize various error message / debug message formatting
Directly make use of format strings instead of formatting a string
beforehand and then passing it to the macros.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/claxon/src/claxondec/imp.rs | 4 | ||||
-rw-r--r-- | audio/csound/src/filter/imp.rs | 6 | ||||
-rw-r--r-- | audio/spotify/src/spotifyaudiosrc/imp.rs | 5 |
3 files changed, 7 insertions, 8 deletions
diff --git a/audio/claxon/src/claxondec/imp.rs b/audio/claxon/src/claxondec/imp.rs index 58f422d9a..001559e33 100644 --- a/audio/claxon/src/claxondec/imp.rs +++ b/audio/claxon/src/claxondec/imp.rs @@ -209,12 +209,12 @@ impl ClaxonDec { indata: &[u8], ) -> Result<gst::FlowSuccess, gst::FlowError> { let streaminfo = claxon_streaminfo(indata).map_err(|e| { - gst::element_imp_error!(self, gst::StreamError::Decode, [e]); + gst::element_imp_error!(self, gst::StreamError::Decode, ["{e}"]); gst::FlowError::Error })?; let audio_info = gstaudioinfo(&streaminfo).map_err(|e| { - gst::element_imp_error!(self, gst::StreamError::Decode, [&e]); + gst::element_imp_error!(self, gst::StreamError::Decode, ["{e}"]); gst::FlowError::Error })?; diff --git a/audio/csound/src/filter/imp.rs b/audio/csound/src/filter/imp.rs index ea0fa4654..6b7a181d0 100644 --- a/audio/csound/src/filter/imp.rs +++ b/audio/csound/src/filter/imp.rs @@ -144,11 +144,11 @@ impl CsoundFilter { if let Some(ref location) = settings.location { csound .compile_csd(location) - .map_err(|e| error_msg!(gst::LibraryError::Failed, [e]))?; + .map_err(|e| error_msg!(gst::LibraryError::Failed, ["{e}"]))?; } else if let Some(ref text) = settings.csd_text { csound .compile_csd_text(text) - .map_err(|e| error_msg!(gst::LibraryError::Failed, [e]))?; + .map_err(|e| error_msg!(gst::LibraryError::Failed, ["{e}"]))?; } else { return Err(error_msg!( gst::LibraryError::Failed, @@ -470,7 +470,7 @@ impl BaseTransformImpl for CsoundFilter { csound.set_score_offset_seconds(settings.offset); if let Err(e) = csound.start() { - return Err(error_msg!(gst::LibraryError::Failed, [e])); + return Err(error_msg!(gst::LibraryError::Failed, ["{e}"])); } Ok(()) diff --git a/audio/spotify/src/spotifyaudiosrc/imp.rs b/audio/spotify/src/spotifyaudiosrc/imp.rs index 05f342431..999313874 100644 --- a/audio/spotify/src/spotifyaudiosrc/imp.rs +++ b/audio/spotify/src/spotifyaudiosrc/imp.rs @@ -324,9 +324,8 @@ impl PushSrcImpl for SpotifyAudioSrc { return Err(gst::FlowError::Flushing); } Ok(Err(err)) => { - let details = format!("{err:?}"); - gst::error!(CAT, imp: self, "failed to start: {}", details); - gst::element_imp_error!(self, gst::ResourceError::Settings, [&details]); + gst::error!(CAT, imp: self, "failed to start: {err:?}"); + gst::element_imp_error!(self, gst::ResourceError::Settings, ["{err:?}"]); return Err(gst::FlowError::Error); } Ok(Ok(_)) => {} |