oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

input/alsa: use AtScopeExit()

Browse Source
This commit is contained in:
Max Kellermann 2016-09-09 16:57:45 +02:00
parent 720bf51ba6
commit 33b70567c8
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/input/plugins/AlsaInputPlugin.cxx
View File

@ -32,6 +32,7 @@
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/StringCompare.hxx" #include "util/StringCompare.hxx"
#include "util/ReusableArray.hxx" #include "util/ReusableArray.hxx"
#include "util/ScopeExit.hxx"
#include "Log.hxx" #include "Log.hxx"
#include "event/MultiSocketMonitor.hxx" #include "event/MultiSocketMonitor.hxx"
@ -254,32 +255,31 @@ ConfigureCapture(snd_pcm_t *capture_handle,
return false; return false;
} }
AtScopeExit(hw_params) {
snd_pcm_hw_params_free(hw_params);
};
if ((err = snd_pcm_hw_params_any(capture_handle, hw_params)) < 0) { if ((err = snd_pcm_hw_params_any(capture_handle, hw_params)) < 0) {
error.Format(alsa_input_domain, "Cannot initialize hardware parameter structure (%s)", snd_strerror(err)); error.Format(alsa_input_domain, "Cannot initialize hardware parameter structure (%s)", snd_strerror(err));
snd_pcm_hw_params_free(hw_params);
return false; return false;
} }
if ((err = snd_pcm_hw_params_set_access(capture_handle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) { if ((err = snd_pcm_hw_params_set_access(capture_handle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) {
error.Format(alsa_input_domain, "Cannot set access type (%s)", snd_strerror (err)); error.Format(alsa_input_domain, "Cannot set access type (%s)", snd_strerror (err));
snd_pcm_hw_params_free(hw_params);
return false; return false;
} }
if ((err = snd_pcm_hw_params_set_format(capture_handle, hw_params, format)) < 0) { if ((err = snd_pcm_hw_params_set_format(capture_handle, hw_params, format)) < 0) {
snd_pcm_hw_params_free(hw_params);
error.Format(alsa_input_domain, "Cannot set sample format (%s)", snd_strerror (err)); error.Format(alsa_input_domain, "Cannot set sample format (%s)", snd_strerror (err));
return false; return false;
} }
if ((err = snd_pcm_hw_params_set_channels(capture_handle, hw_params, channels)) < 0) { if ((err = snd_pcm_hw_params_set_channels(capture_handle, hw_params, channels)) < 0) {
snd_pcm_hw_params_free(hw_params);
error.Format(alsa_input_domain, "Cannot set channels (%s)", snd_strerror (err)); error.Format(alsa_input_domain, "Cannot set channels (%s)", snd_strerror (err));
return false; return false;
} }
if ((err = snd_pcm_hw_params_set_rate(capture_handle, hw_params, rate, 0)) < 0) { if ((err = snd_pcm_hw_params_set_rate(capture_handle, hw_params, rate, 0)) < 0) {
snd_pcm_hw_params_free(hw_params);
error.Format(alsa_input_domain, "Cannot set sample rate (%s)", snd_strerror (err)); error.Format(alsa_input_domain, "Cannot set sample rate (%s)", snd_strerror (err));
return false; return false;
} }
@ -296,41 +296,37 @@ ConfigureCapture(snd_pcm_t *capture_handle,
&period, &direction)) < 0) { &period, &direction)) < 0) {
error.Format(alsa_input_domain, "Cannot set period size (%s)", error.Format(alsa_input_domain, "Cannot set period size (%s)",
snd_strerror(err)); snd_strerror(err));
snd_pcm_hw_params_free(hw_params);
return false; return false;
} }
if ((err = snd_pcm_hw_params(capture_handle, hw_params)) < 0) { if ((err = snd_pcm_hw_params(capture_handle, hw_params)) < 0) {
error.Format(alsa_input_domain, "Cannot set parameters (%s)", error.Format(alsa_input_domain, "Cannot set parameters (%s)",
snd_strerror(err)); snd_strerror(err));
snd_pcm_hw_params_free(hw_params);
return false; return false;
} }
snd_pcm_hw_params_free (hw_params);
snd_pcm_sw_params_t *sw_params; snd_pcm_sw_params_t *sw_params;
snd_pcm_sw_params_malloc(&sw_params); snd_pcm_sw_params_malloc(&sw_params);
snd_pcm_sw_params_current(capture_handle, sw_params); snd_pcm_sw_params_current(capture_handle, sw_params);
AtScopeExit(sw_params) {
snd_pcm_sw_params_free(sw_params);
};
if ((err = snd_pcm_sw_params_set_start_threshold(capture_handle, sw_params, if ((err = snd_pcm_sw_params_set_start_threshold(capture_handle, sw_params,
period)) < 0) { period)) < 0) {
error.Format(alsa_input_domain, error.Format(alsa_input_domain,
"unable to set start threshold (%s)", snd_strerror(err)); "unable to set start threshold (%s)", snd_strerror(err));
snd_pcm_sw_params_free(sw_params);
return false; return false;
} }
if ((err = snd_pcm_sw_params(capture_handle, sw_params)) < 0) { if ((err = snd_pcm_sw_params(capture_handle, sw_params)) < 0) {
error.Format(alsa_input_domain, error.Format(alsa_input_domain,
"unable to install sw params (%s)", snd_strerror(err)); "unable to install sw params (%s)", snd_strerror(err));
snd_pcm_sw_params_free(sw_params);
return false; return false;
} }
snd_pcm_sw_params_free(sw_params);
return true; return true;
} }