summaryrefslogtreecommitdiffstats
path: root/src/modules/udev-util.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-06-17 03:45:14 +0200
committerLennart Poettering <lennart@poettering.net>2009-06-17 03:45:14 +0200
commit31575f7766d6ff39665b64a3a04412eff1c39957 (patch)
treedfb35a4918c8242a60d94120defd4e97beaff2c1 /src/modules/udev-util.c
parente9c70ac41bb86b7778b67284d8a0cae51f6a9ed3 (diff)
alsa: rework mixer logic
Completely rework mixer logic. This now allows controlling a full set of elements from a single sink's volume slider/mute button. This also introduces sink and source "ports" that can be used to choose different input or output ports with the UI. (i.e. "mic"/"line-in" or "speaker"/"headphones". The mixer paths and device maps are now configered in external configuration files and can be tweaked as necessary.
Diffstat (limited to 'src/modules/udev-util.c')
-rw-r--r--src/modules/udev-util.c40
1 files changed, 38 insertions, 2 deletions
diff --git a/src/modules/udev-util.c b/src/modules/udev-util.c
index de8f5f2f..cc824465 100644
--- a/src/modules/udev-util.c
+++ b/src/modules/udev-util.c
@@ -58,7 +58,7 @@ static int read_id(struct udev_device *d, const char *n) {
return u;
}
-int pa_udev_get_info(pa_core *core, pa_proplist *p, int card_idx) {
+int pa_udev_get_info(int card_idx, pa_proplist *p) {
int r = -1;
struct udev *udev;
struct udev_device *card = NULL;
@@ -66,7 +66,6 @@ int pa_udev_get_info(pa_core *core, pa_proplist *p, int card_idx) {
const char *v;
int id;
- pa_assert(core);
pa_assert(p);
pa_assert(card_idx >= 0);
@@ -153,3 +152,40 @@ finish:
return r;
}
+
+char* pa_udev_get_property(int card_idx, const char *name) {
+ struct udev *udev;
+ struct udev_device *card = NULL;
+ char *t, *r = NULL;
+ const char *v;
+
+ pa_assert(card_idx >= 0);
+ 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%i", 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_property_value(card, name)) && *v)
+ r = pa_xstrdup(v);
+
+finish:
+
+ if (card)
+ udev_device_unref(card);
+
+ if (udev)
+ udev_unref(udev);
+
+ return r;
+}