[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.16-test5-13-gd06680a

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  9abc010c930999eed67253f5b83f7c226b1a17f6 (commit)

- Log -----------------------------------------------------------------
d06680a udev: always verify access before loading modules
14c27c7 gconf: use correct path for gconf-helper tool when running from build tree
-----------------------------------------------------------------------

Summary of changes:
 src/modules/gconf/module-gconf.c |    9 +++++----
 src/modules/module-udev-detect.c |   14 +++-----------
 2 files changed, 8 insertions(+), 15 deletions(-)

-----------------------------------------------------------------------

commit 14c27c7ade403683e06705e45b9a3df28102a909
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Aug 21 22:05:27 2009 +0200

    gconf: use correct path for gconf-helper tool when running from build tree

diff --git a/src/modules/gconf/module-gconf.c b/src/modules/gconf/module-gconf.c
index c01ebbf..85523b3 100644
--- a/src/modules/gconf/module-gconf.c
+++ b/src/modules/gconf/module-gconf.c
@@ -52,9 +52,6 @@ PA_MODULE_LOAD_ONCE(TRUE);
 #define MAX_MODULES 10
 #define BUF_MAX 2048
 
-/* #undef PA_GCONF_HELPER */
-/* #define PA_GCONF_HELPER "/home/lennart/projects/pulseaudio/src/gconf-helper" */
-
 struct module_item {
     char *name;
     char *args;
@@ -343,7 +340,11 @@ int pa__init(pa_module*m) {
     u->io_event = NULL;
     u->buf_fill = 0;
 
-    if ((u->fd = pa_start_child_for_read(PA_GCONF_HELPER, NULL, &u->pid)) < 0)
+    if ((u->fd = pa_start_child_for_read(
+#if defined(__linux__) && !defined(__OPTIMIZE__)
+                              pa_run_from_build_tree() ? PA_BUILDDIR "/.libs/gconf-helper" :
+#endif
+                 PA_GCONF_HELPER, NULL, &u->pid)) < 0)
         goto fail;
 
     u->io_event = m->core->mainloop->io_new(

commit d06680afe88d14a46ce8a4541d43d514a225732f
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Aug 21 22:06:23 2009 +0200

    udev: always verify access before loading modules

diff --git a/src/modules/module-udev-detect.c b/src/modules/module-udev-detect.c
index 22ce8c3..2c7e7dc 100644
--- a/src/modules/module-udev-detect.c
+++ b/src/modules/module-udev-detect.c
@@ -142,7 +142,6 @@ static void card_changed(struct userdata *u, struct udev_device *dev) {
     struct device *d;
     const char *path;
     const char *t;
-    pa_module *m;
     char *n;
 
     pa_assert(u);
@@ -183,16 +182,9 @@ static void card_changed(struct userdata *u, struct udev_device *dev) {
                                 pa_yes_no(u->ignore_dB));
     pa_xfree(n);
 
-    pa_log_debug("Loading module-alsa-card with arguments '%s'", d->args);
-    m = pa_module_load(u->core, "module-alsa-card", d->args);
-
-    if (m) {
-        d->module = m->index;
-        pa_log_info("Card %s (%s) added and module loaded.", path, d->card_name);
-    } else
-        pa_log_info("Card %s (%s) added but failed to load module.", path, d->card_name);
-
     pa_hashmap_put(u->devices, d->path, d);
+
+    verify_access(u, d);
 }
 
 static void remove_card(struct userdata *u, struct udev_device *dev) {
@@ -472,7 +464,7 @@ int pa__init(pa_module *m) {
 
     udev_enumerate_unref(enumerate);
 
-    pa_log_info("Loaded %u modules.", pa_hashmap_size(u->devices));
+    pa_log_info("Found %u cards.", pa_hashmap_size(u->devices));
 
     pa_modargs_free(ma);
 

-- 
hooks/post-receive
PulseAudio Sound Server