mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

udev: Don't use deprecated udev_get_*_path() functions

Browse source 
[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>
This commit is contained in:
Marc-Antoine Perennou 2012-05-17 22:50:22 +02:00 • committed by Arun Raghavan
parent ac1a466f21
commit 2e64edbd3e
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -123,7 +123,7 @@ static char *card_get_sysattr(const char *card_idx, const char *name) {
goto finish; 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); card = udev_device_new_from_syspath(udev, t);
pa_xfree(t); pa_xfree(t);
@ -282,7 +282,7 @@ static void verify_access(struct userdata *u, struct device *d) {
pa_assert(u); pa_assert(u);
pa_assert(d); 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; accessible = access(cd, R_OK|W_OK) >= 0;
pa_log_debug("%s is accessible: %s", cd, pa_yes_no(accessible)); pa_log_debug("%s is accessible: %s", cd, pa_yes_no(accessible));
@ -621,7 +621,6 @@ fail:
} }
static int setup_inotify(struct userdata *u) { static int setup_inotify(struct userdata *u) {
char *dev_snd;
int r; int r;
if (u->inotify_fd >= 0) if (u->inotify_fd >= 0)
@ -632,9 +631,7 @@ static int setup_inotify(struct userdata *u) {
return -1; 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);
r = inotify_add_watch(u->inotify_fd, dev_snd, IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF);
pa_xfree(dev_snd);
if (r < 0) { if (r < 0) {
int saved_errno = errno; int saved_errno = errno;

4
src/modules/udev-util.c
View file

@ -180,7 +180,7 @@ int pa_udev_get_info(int card_idx, pa_proplist *p) {
goto finish; 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); card = udev_device_new_from_syspath(udev, t);
pa_xfree(t); pa_xfree(t);
@ -277,7 +277,7 @@ char* pa_udev_get_property(int card_idx, const char *name) {
goto finish; 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); card = udev_device_new_from_syspath(udev, t);
pa_xfree(t); pa_xfree(t);