mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor optimizations

Browse source
This commit is contained in:
Lennart Poettering 2009-02-18 21:50:09 +01:00
parent ff58fa8870
commit dc1ad08a65
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/modules/alsa/alsa-util.c
View file

@ -343,7 +343,8 @@ int pa_alsa_set_hw_params(
goto finish; goto finish;
if (_use_mmap) { if (_use_mmap) {
if ((ret = snd_pcm_hw_params_set_access(pcm_handle, hwparams, SND_PCM_ACCESS_MMAP_INTERLEAVED)) < 0) {
if (snd_pcm_hw_params_set_access(pcm_handle, hwparams, SND_PCM_ACCESS_MMAP_INTERLEAVED) < 0) {
/* mmap() didn't work, fall back to interleaved */ /* mmap() didn't work, fall back to interleaved */
@ -806,8 +807,7 @@ snd_pcm_t *pa_alsa_open_by_device_string(
SND_PCM_NO_AUTO_CHANNELS| SND_PCM_NO_AUTO_CHANNELS|
(reformat ? 0 : SND_PCM_NO_AUTO_FORMAT))) < 0) { (reformat ? 0 : SND_PCM_NO_AUTO_FORMAT))) < 0) {
pa_log_info("Error opening PCM device %s: %s", d, snd_strerror(err)); pa_log_info("Error opening PCM device %s: %s", d, snd_strerror(err));
pa_xfree(d); goto fail;
return NULL;
} }
if ((err = pa_alsa_set_hw_params(pcm_handle, ss, nfrags, period_size, tsched_size, use_mmap, use_tsched, require_exact_channel_number)) < 0) { if ((err = pa_alsa_set_hw_params(pcm_handle, ss, nfrags, period_size, tsched_size, use_mmap, use_tsched, require_exact_channel_number)) < 0) {
@ -835,9 +835,9 @@ snd_pcm_t *pa_alsa_open_by_device_string(
} }
pa_log_info("Failed to set hardware parameters on %s: %s", d, snd_strerror(err)); pa_log_info("Failed to set hardware parameters on %s: %s", d, snd_strerror(err));
pa_xfree(d);
snd_pcm_close(pcm_handle); snd_pcm_close(pcm_handle);
return NULL;
goto fail;
} }
if (dev) if (dev)
@ -850,6 +850,11 @@ snd_pcm_t *pa_alsa_open_by_device_string(
return pcm_handle; return pcm_handle;
} }
fail:
pa_xfree(d);
return NULL;
} }
int pa_alsa_probe_profiles( int pa_alsa_probe_profiles(