1
Index: pulseaudio-0.9.21/src/modules/module-udev-detect.c
2
===================================================================
3
--- pulseaudio-0.9.21.orig/src/modules/module-udev-detect.c 2009-12-07 22:26:14.000000000 -0500
4
+++ pulseaudio-0.9.21/src/modules/module-udev-detect.c 2009-12-07 22:26:30.000000000 -0500
9
+static const char *pa_udev_get_sysattr(const char *card_idx, const char *name);
11
static pa_bool_t is_card_busy(const char *id) {
12
- char *card_path = NULL, *pcm_path = NULL, *sub_status = NULL;
13
+ const char *pcm_class;
14
+ char *card_path = NULL, *pcm_path = NULL, *sub_status = NULL,
16
DIR *card_dir = NULL, *pcm_dir = NULL;
17
FILE *status_file = NULL;
19
struct dirent *space = NULL, *de;
20
- pa_bool_t busy = FALSE;
21
+ pa_bool_t busy = FALSE, is_modem = FALSE;
26
len = offsetof(struct dirent, d_name) + fpathconf(dirfd(card_dir), _PC_NAME_MAX) + 1;
27
space = pa_xmalloc(len);
29
+ /* Also check /sys/class/sound/card.../pcmC...D6p/pcm_class. An HDA
30
+ * modem can be used simultaneously with generic playback/record. */
32
+ pa_xfree(sysfs_path);
33
+ sysfs_path = pa_sprintf_malloc("pcmC%sD6p/pcm_class", id);
35
+ pcm_class = pa_udev_get_sysattr(id, sysfs_path);
37
+ if (pcm_class && pa_streq(pcm_class, "modem"))
47
- if (!pa_streq(line, "closed\n")) {
48
+ if (!is_modem && !pa_streq(line, "closed\n")) {
56
+ pa_xfree(sysfs_path);
64
+static const char *pa_udev_get_sysattr(const char *card_idx, const char *name) {
66
+ struct udev_device *card = NULL;
70
+ pa_assert(card_idx);
73
+ if (!(udev = udev_new())) {
74
+ pa_log_error("Failed to allocate udev context.");
78
+ t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx);
79
+ card = udev_device_new_from_syspath(udev, t);
83
+ pa_log_error("Failed to get card object.");
87
+ if ((v = udev_device_get_sysattr_value(card, name)) && *v)
93
+ udev_device_unref(card);
101
int pa__init(pa_module *m) {
102
struct userdata *u = NULL;