mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

udev: handle sound cards with both modem and audio properly

Browse source 
http://pulseaudio.org/ticket/681
https://bugs.launchpad.net/ubuntu/+source/pulseaudio/+bug/394500
This commit is contained in:
Daniel T. Chen 2010-01-14 00:57:27 +01:00 • committed by Colin Guthrie
parent 7b89c8531c
commit c2ab61c54d
1 changed files with 56 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/modules/module-udev-detect.c
View file

@ -103,13 +103,17 @@ static const char *path_get_card_id(const char *path) {
return e + 5; return e + 5;
} }
static const char *pa_udev_get_sysattr(const char *card_idx, const char *name);
static pa_bool_t is_card_busy(const char *id) { static pa_bool_t is_card_busy(const char *id) {
char *card_path = NULL, *pcm_path = NULL, *sub_status = NULL; const char *pcm_class;
char *card_path = NULL, *pcm_path = NULL, *sub_status = NULL,
*sysfs_path = NULL;
DIR *card_dir = NULL, *pcm_dir = NULL; DIR *card_dir = NULL, *pcm_dir = NULL;
FILE *status_file = NULL; FILE *status_file = NULL;
size_t len; size_t len;
struct dirent *space = NULL, *de; struct dirent *space = NULL, *de;
pa_bool_t busy = FALSE; pa_bool_t busy = FALSE, is_modem = FALSE;
int r; int r;
pa_assert(id); pa_assert(id);
@ -127,6 +131,17 @@ static pa_bool_t is_card_busy(const char *id) {
len = offsetof(struct dirent, d_name) + fpathconf(dirfd(card_dir), _PC_NAME_MAX) + 1; len = offsetof(struct dirent, d_name) + fpathconf(dirfd(card_dir), _PC_NAME_MAX) + 1;
space = pa_xmalloc(len); space = pa_xmalloc(len);
/* Also check /sys/class/sound/card.../pcmC...D6p/pcm_class. An HDA
* modem can be used simultaneously with generic playback/record. */
pa_xfree(sysfs_path);
sysfs_path = pa_sprintf_malloc("pcmC%sD6p/pcm_class", id);
pcm_class = pa_udev_get_sysattr(id, sysfs_path);
if (pcm_class && pa_streq(pcm_class, "modem"))
is_modem = TRUE;
for (;;) { for (;;) {
de = NULL; de = NULL;
@ -182,7 +197,7 @@ static pa_bool_t is_card_busy(const char *id) {
continue; continue;
} }
if (!pa_streq(line, "closed\n")) { if (!is_modem && !pa_streq(line, "closed\n")) {
busy = TRUE; busy = TRUE;
break; break;
} }
@ -193,6 +208,7 @@ fail:
pa_xfree(card_path); pa_xfree(card_path);
pa_xfree(pcm_path); pa_xfree(pcm_path);
pa_xfree(sysfs_path);
pa_xfree(sub_status); pa_xfree(sub_status);
pa_xfree(space); pa_xfree(space);
@ -594,6 +610,43 @@ static int setup_inotify(struct userdata *u) {
return 0; return 0;
} }
static const char *pa_udev_get_sysattr(const char *card_idx, const char *name) {
struct udev *udev;
struct udev_device *card = NULL;
char *t, *r = NULL;
const char *v;
pa_assert(card_idx);
pa_assert(name);
if (!(udev = udev_new())) {
pa_log_error("Failed to allocate udev context.");
goto finish;
}
t = pa_sprintf_malloc("%s/class/sound/card%s", udev_get_sys_path(udev), card_idx);
card = udev_device_new_from_syspath(udev, t);
pa_xfree(t);
if (!card) {
pa_log_error("Failed to get card object.");
goto finish;
}
if ((v = udev_device_get_sysattr_value(card, name)) && *v)
r = pa_xstrdup(v);
finish:
if (card)
udev_device_unref(card);
if (udev)
udev_unref(udev);
return r;
}
int pa__init(pa_module *m) { int pa__init(pa_module *m) {
struct userdata *u = NULL; struct userdata *u = NULL;
pa_modargs *ma; pa_modargs *ma;