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

fall back to plughw:, if hw: doesn't work, in the alsa source, too

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1865 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-09-18 23:35:05 +00:00
parent 781cf499cf
commit ac66b6af08
2 changed files with 45 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/module-alsa-sink.c
View file

@ -774,6 +774,8 @@ int pa__init(pa_module*m) {
break;
}
u->device_name = dev;
if (use_mmap && !b) {
pa_log_info("Device doesn't support mmap(), falling back to UNIX read/write mode.");
u->use_mmap = use_mmap = b;
@ -787,8 +789,6 @@ int pa__init(pa_module*m) {
goto fail;
}
u->device_name = dev;
if ((err = pa_alsa_set_sw_params(u->pcm_handle)) < 0) {
pa_log("Failed to set software parameters: %s", snd_strerror(err));
goto fail;

60
src/modules/module-alsa-source.c
View file

@ -660,7 +660,7 @@ int pa__init(pa_module*m) {
pa_modargs *ma = NULL;
struct userdata *u = NULL;
const char *dev;
char *dev;
pa_sample_spec ss;
pa_channel_map map;
unsigned nfrags, frag_size;
@ -718,24 +718,45 @@ int pa__init(pa_module*m) {
pa_rtpoll_item_new_asyncmsgq(u->rtpoll, PA_RTPOLL_EARLY, u->thread_mq.inq);
snd_config_update_free_global();
if ((err = snd_pcm_open(&u->pcm_handle, dev = pa_modargs_get_value(ma, "device", DEFAULT_DEVICE), SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK)) < 0) {
pa_log("Error opening PCM device %s: %s", dev, snd_strerror(err));
goto fail;
}
u->device_name = pa_xstrdup(dev);
if ((err = snd_pcm_info(u->pcm_handle, pcm_info)) < 0) {
pa_log("Error fetching PCM info: %s", snd_strerror(err));
goto fail;
}
b = use_mmap;
if ((err = pa_alsa_set_hw_params(u->pcm_handle, &ss, &nfrags, &period_size, &b)) < 0) {
pa_log("Failed to set hardware parameters: %s", snd_strerror(err));
goto fail;
dev = pa_xstrdup(pa_modargs_get_value(ma, "device", DEFAULT_DEVICE));
for (;;) {
if ((err = snd_pcm_open(&u->pcm_handle, dev, SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK)) < 0) {
pa_log("Error opening PCM device %s: %s", dev, snd_strerror(err));
pa_xfree(dev);
goto fail;
}
b = use_mmap;
if ((err = pa_alsa_set_hw_params(u->pcm_handle, &ss, &nfrags, &period_size, &b)) < 0) {
if (err == -EPERM) {
/* Hmm, some hw is very exotic, so we retry with plughw, if hw didn't work */
if (pa_startswith(dev, "hw:")) {
char *d = pa_sprintf_malloc("plughw:%s", dev+3);
pa_log_debug("Opening the device as '%s' didn't work, retrying with '%s'.", dev, d);
pa_xfree(dev);
dev = d;
snd_pcm_close(u->pcm_handle);
u->pcm_handle = NULL;
continue;
}
}
pa_log("Failed to set hardware parameters: %s", snd_strerror(err));
pa_xfree(dev);
goto fail;
}
break;
}
u->device_name = dev;
if (use_mmap && !b) {
pa_log_info("Device doesn't support mmap(), falling back to UNIX read/write mode.");
u->use_mmap = use_mmap = b;
@ -744,6 +765,11 @@ int pa__init(pa_module*m) {
if (u->use_mmap)
pa_log_info("Successfully enabled mmap() mode.");
if ((err = snd_pcm_info(u->pcm_handle, pcm_info)) < 0) {
pa_log("Error fetching PCM info: %s", snd_strerror(err));
goto fail;
}
if ((err = pa_alsa_set_sw_params(u->pcm_handle)) < 0) {
pa_log("Failed to set software parameters: %s", snd_strerror(err));
goto fail;