diff options
| author | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2012-05-17 22:50:22 +0200 |
|---|---|---|
| committer | Arun Raghavan <arun.raghavan@collabora.co.uk> | 2012-07-03 17:18:39 +0530 |
| commit | 2e64edbd3e12145950ccd952bb7984a4420b8c02 (patch) | |
| tree | 45504efc9dc76cfb9e27bdf0079f012d2c22e0df /src | |
| parent | ac1a466f219389e543e2edd75dd5ea6cb86ef3f7 (diff) | |
udev: Don't use deprecated udev_get_*_path() functions
[These symbols were removed in libudev.so.1.0.0. Replace them with
hardcoded strings. -- heftig]
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/module-udev-detect.c | 9 | ||||
| -rw-r--r-- | src/modules/udev-util.c | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/modules/module-udev-detect.c b/src/modules/module-udev-detect.c index 1192194d..31416bd3 100644 --- a/src/modules/module-udev-detect.c +++ b/src/modules/module-udev-detect.c @@ -123,7 +123,7 @@ static char *card_get_sysattr(const char *card_idx, const char *name) { goto finish; } - t = pa_sprintf_malloc("%s/class/sound/card%s", udev_get_sys_path(udev), card_idx); + t = pa_sprintf_malloc("/sys/class/sound/card%s", card_idx); card = udev_device_new_from_syspath(udev, t); pa_xfree(t); @@ -282,7 +282,7 @@ static void verify_access(struct userdata *u, struct device *d) { pa_assert(u); pa_assert(d); - cd = pa_sprintf_malloc("%s/snd/controlC%s", udev_get_dev_path(u->udev), path_get_card_id(d->path)); + cd = pa_sprintf_malloc("/dev/snd/controlC%s", path_get_card_id(d->path)); accessible = access(cd, R_OK|W_OK) >= 0; pa_log_debug("%s is accessible: %s", cd, pa_yes_no(accessible)); @@ -621,7 +621,6 @@ fail: } static int setup_inotify(struct userdata *u) { - char *dev_snd; int r; if (u->inotify_fd >= 0) @@ -632,9 +631,7 @@ static int setup_inotify(struct userdata *u) { return -1; } - dev_snd = pa_sprintf_malloc("%s/snd", udev_get_dev_path(u->udev)); - r = inotify_add_watch(u->inotify_fd, dev_snd, IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF); - pa_xfree(dev_snd); + r = inotify_add_watch(u->inotify_fd, "/dev/snd", IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF); if (r < 0) { int saved_errno = errno; diff --git a/src/modules/udev-util.c b/src/modules/udev-util.c index 2f18bc42..b0bb17da 100644 --- a/src/modules/udev-util.c +++ b/src/modules/udev-util.c @@ -180,7 +180,7 @@ int pa_udev_get_info(int card_idx, pa_proplist *p) { goto finish; } - t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx); + t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx); card = udev_device_new_from_syspath(udev, t); pa_xfree(t); @@ -277,7 +277,7 @@ char* pa_udev_get_property(int card_idx, const char *name) { goto finish; } - t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx); + t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx); card = udev_device_new_from_syspath(udev, t); pa_xfree(t); |