[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, stable-queue, updated. v0.9.20-56-g3014081

Colin Guthrie gitmailer-noreply at 0pointer.de
Fri Nov 20 08:58:31 PST 2009


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 stable-queue branch has been updated
      from  25537ffa0041b795f6fe76fb408cf26e73f69376 (commit)

- Log -----------------------------------------------------------------
3014081 Merge branch '0.9.20-stable' into stable-queue
231417c rygel: fix itemCount property for sources
9f41584 build-sys: Fix missing trailing slash in 14eaf2
8edf2f0 build-sys: Make sure all alsa path config files are installed
-----------------------------------------------------------------------

Summary of changes:
 src/Makefile.am                         |   66 +++++++++++++------------------
 src/modules/module-rygel-media-server.c |   45 ++++++++++++++++-----
 2 files changed, 61 insertions(+), 50 deletions(-)

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

commit 8edf2f0ed81a1c5d823e88a04e073af075aaeb13
Author: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
Date:   Sat Nov 14 22:23:10 2009 +0000

    build-sys: Make sure all alsa path config files are installed
    
    While all alsa path configuration files were in EXTRA_DIST not all of them were
    in in alsapaths_DATA. Fixed by only defining the list in one place

diff --git a/src/Makefile.am b/src/Makefile.am
index de15a8f..21629f9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -107,25 +107,12 @@ MODULE_LDFLAGS = -module -disable-static -avoid-version $(LDFLAGS_NOUNDEFINED)
 #          Extra files            #
 ###################################
 
-EXTRA_DIST = \
-		pulse/client.conf.in \
-		pulse/version.h.in \
-		daemon/daemon.conf.in \
-		daemon/default.pa.in \
-		daemon/system.pa.in \
-		daemon/default.pa.win32 \
-		depmod.py \
-		daemon/esdcompat.in \
-		daemon/start-pulseaudio-x11.in \
-		utils/padsp \
-		modules/module-defs.h.m4 \
-		daemon/pulseaudio.desktop.in \
-		map-file \
-		daemon/pulseaudio-system.conf \
+ALSA_PROFILES = \
 		modules/alsa/mixer/profile-sets/default.conf \
 		modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \
-		modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf \
-		modules/alsa/mixer/profile-sets/90-pulseaudio.rules \
+		modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf
+
+ALSA_PATHS = \
 		modules/alsa/mixer/paths/analog-input-aux.conf \
 		modules/alsa/mixer/paths/analog-input.conf \
 		modules/alsa/mixer/paths/analog-input.conf.common \
@@ -144,6 +131,25 @@ EXTRA_DIST = \
 		modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \
 		modules/alsa/mixer/paths/analog-output-mono.conf
 
+EXTRA_DIST = \
+		pulse/client.conf.in \
+		pulse/version.h.in \
+		daemon/daemon.conf.in \
+		daemon/default.pa.in \
+		daemon/system.pa.in \
+		daemon/default.pa.win32 \
+		depmod.py \
+		daemon/esdcompat.in \
+		daemon/start-pulseaudio-x11.in \
+		utils/padsp \
+		modules/module-defs.h.m4 \
+		daemon/pulseaudio.desktop.in \
+		map-file \
+		daemon/pulseaudio-system.conf \
+		modules/alsa/mixer/profile-sets/90-pulseaudio.rules
+		${ALSA_PROFILES} \
+		${ALSA_PATHS}
+
 pulseconf_DATA = \
 		default.pa \
 		system.pa \
@@ -1072,32 +1078,14 @@ modlibexec_LTLIBRARIES += \
 		module-alsa-source.la \
 		module-alsa-card.la
 
-alsaprofilesets_DATA = \
-		modules/alsa/mixer/profile-sets/default.conf \
-		modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \
-		modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf
+alsaprofilesets_DATA = ${ALSA_PROFILES}
 
 if HAVE_UDEV
 udevrules_DATA = \
 		modules/alsa/mixer/profile-sets/90-pulseaudio.rules
 endif
 
-alsapaths_DATA = \
-		modules/alsa/mixer/paths/analog-input-aux.conf \
-		modules/alsa/mixer/paths/analog-input.conf \
-		modules/alsa/mixer/paths/analog-input.conf.common \
-		modules/alsa/mixer/paths/analog-input-fm.conf \
-		modules/alsa/mixer/paths/analog-input-linein.conf \
-		modules/alsa/mixer/paths/analog-input-mic.conf \
-		modules/alsa/mixer/paths/analog-input-mic.conf.common \
-		modules/alsa/mixer/paths/analog-input-mic-line.conf \
-		modules/alsa/mixer/paths/analog-input-tvtuner.conf \
-		modules/alsa/mixer/paths/analog-input-video.conf \
-		modules/alsa/mixer/paths/analog-output.conf \
-		modules/alsa/mixer/paths/analog-output.conf.common \
-		modules/alsa/mixer/paths/analog-output-headphones.conf \
-		modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \
-		modules/alsa/mixer/paths/analog-output-mono.conf
+alsapaths_DATA = ${ALSA_PATHS}
 
 endif
 

commit 9f415841f51e1bf8afe4f6cb2e506592d416cd92
Author: Colin Guthrie <cguthrie at mandriva.org>
Date:   Mon Nov 16 23:36:44 2009 +0000

    build-sys: Fix missing trailing slash in 14eaf2

diff --git a/src/Makefile.am b/src/Makefile.am
index 21629f9..171a4a0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -146,7 +146,7 @@ EXTRA_DIST = \
 		daemon/pulseaudio.desktop.in \
 		map-file \
 		daemon/pulseaudio-system.conf \
-		modules/alsa/mixer/profile-sets/90-pulseaudio.rules
+		modules/alsa/mixer/profile-sets/90-pulseaudio.rules \
 		${ALSA_PROFILES} \
 		${ALSA_PATHS}
 

commit 231417c8674c7e383bf538e8b1c4bcef13f084f6
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Nov 18 21:41:38 2009 +0100

    rygel: fix itemCount property for sources
    
    Fixes http://pulseaudio.org/ticket/721

diff --git a/src/modules/module-rygel-media-server.c b/src/modules/module-rygel-media-server.c
index 4c02e95..82bcd14 100644
--- a/src/modules/module-rygel-media-server.c
+++ b/src/modules/module-rygel-media-server.c
@@ -464,8 +464,18 @@ static char **child_array(struct userdata *u, const char *path, unsigned *n) {
 
     if (pa_streq(path, OBJECT_SINKS))
         m = pa_idxset_size(u->core->sinks);
-    else
+    else {
+        unsigned k;
+
         m = pa_idxset_size(u->core->sources);
+        k = pa_idxset_size(u->core->sinks);
+
+        pa_assert(m >= k);
+
+        /* Subtract the monitor sources from the numbers of
+         * sources. There is one monitor source for each sink */
+        m -= k;
+    }
 
     array = pa_xnew(char*, m);
     *n = 0;
@@ -473,14 +483,20 @@ static char **child_array(struct userdata *u, const char *path, unsigned *n) {
     if (pa_streq(path, OBJECT_SINKS)) {
         pa_sink *sink;
 
-        PA_IDXSET_FOREACH(sink, u->core->sinks, idx)
+        PA_IDXSET_FOREACH(sink, u->core->sinks, idx) {
+            pa_assert((*n) < m);
             array[(*n)++] = pa_sprintf_malloc(OBJECT_SINKS "/%u", sink->index);
+        }
     } else {
         pa_source *source;
 
-        PA_IDXSET_FOREACH(source, u->core->sources, idx)
-            if (!source->monitor_of)
+        PA_IDXSET_FOREACH(source, u->core->sources, idx) {
+
+            if (!source->monitor_of) {
+                pa_assert((*n) < m);
                 array[(*n)++] = pa_sprintf_malloc(OBJECT_SOURCES "/%u", source->index);
+            }
+        }
     }
 
     pa_assert((*n) <= m);
@@ -529,16 +545,20 @@ static DBusHandlerResult sinks_and_sources_handler(DBusConnection *c, DBusMessag
             free_child_array(array, n);
 
         } else if (message_is_property_get(m, "org.gnome.UPnP.MediaContainer1", "ItemCount")) {
+            unsigned n, k;
+
+            n = pa_idxset_size(u->core->sinks);
+            k = pa_idxset_size(u->core->sources);
+            pa_assert(k >= n);
+
             pa_assert_se(r = dbus_message_new_method_return(m));
             append_variant_unsigned(r, NULL,
-                                    pa_streq(path, OBJECT_SINKS) ?
-                                    pa_idxset_size(u->core->sinks) :
-                                    pa_idxset_size(u->core->sources));
+                                    pa_streq(path, OBJECT_SINKS) ? n : k - n);
 
         } else if (message_is_property_get_all(m, "org.gnome.UPnP.MediaContainer1")) {
             DBusMessageIter iter, sub;
             char **array;
-            unsigned n;
+            unsigned n, k;
 
             pa_assert_se(r = dbus_message_new_method_return(m));
             dbus_message_iter_init_append(r, &iter);
@@ -550,10 +570,13 @@ static DBusHandlerResult sinks_and_sources_handler(DBusConnection *c, DBusMessag
             array = child_array(u, path, &n);
             append_property_dict_entry_object_array(r, &sub, "Items", (const char**) array, n);
             free_child_array(array, n);
+
+            n = pa_idxset_size(u->core->sinks);
+            k = pa_idxset_size(u->core->sources);
+            pa_assert(k >= n);
+
             append_property_dict_entry_unsigned(r, &sub, "ItemCount",
-                                                pa_streq(path, OBJECT_SINKS) ?
-                                                pa_idxset_size(u->core->sinks) :
-                                                pa_idxset_size(u->core->sources));
+                                                pa_streq(path, OBJECT_SINKS) ? n : k - n);
 
             pa_assert_se(dbus_message_iter_close_container(&iter, &sub));
 

commit 3014081136b7d920940f085c0bc9b0e5c16fb398
Merge: 25537ff 231417c
Author: Colin Guthrie <cguthrie at mandriva.org>
Date:   Fri Nov 20 16:58:28 2009 +0000

    Merge branch '0.9.20-stable' into stable-queue
    
    Conflicts:
    	src/Makefile.am

diff --cc src/Makefile.am
index d5a6686,171a4a0..598e77f
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -146,6 -131,25 +131,27 @@@ ALSA_PATHS = 
  		modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \
  		modules/alsa/mixer/paths/analog-output-mono.conf
  
+ EXTRA_DIST = \
+ 		pulse/client.conf.in \
+ 		pulse/version.h.in \
+ 		daemon/daemon.conf.in \
+ 		daemon/default.pa.in \
+ 		daemon/system.pa.in \
+ 		daemon/default.pa.win32 \
+ 		depmod.py \
+ 		daemon/esdcompat.in \
+ 		daemon/start-pulseaudio-x11.in \
++		daemon/start-pulseaudio-kde.in \
+ 		utils/padsp \
+ 		modules/module-defs.h.m4 \
+ 		daemon/pulseaudio.desktop.in \
++		daemon/pulseaudio-kde.desktop.in \
+ 		map-file \
+ 		daemon/pulseaudio-system.conf \
+ 		modules/alsa/mixer/profile-sets/90-pulseaudio.rules \
+ 		${ALSA_PROFILES} \
+ 		${ALSA_PATHS}
+ 
  pulseconf_DATA = \
  		default.pa \
  		system.pa \

-- 
hooks/post-receive
PulseAudio Sound Server



More information about the pulseaudio-commits mailing list