[pulseaudio-commits] Branch 'next' - 2 commits - configure.ac src/pulsecore

[Arun Raghavan]

 configure.ac                    |    2 +-
 src/pulsecore/protocol-native.c |   12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 0c04c2dee341a46cfb44fff16500fc7269585fc3
Author: Arun Raghavan <arun at accosted.net>
Date:   Sat Feb 15 10:04:39 2014 +0530

    build-sys: Bump soname
    
    Bumping from 0->3 since we missed bumping correctly for v4.99.{1,2,3}

diff --git a/configure.ac b/configure.ac
index 38a40a7..e75973f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ AC_SUBST(PA_PROTOCOL_VERSION, 29)
 
 # The stable ABI for client applications, for the version info x:y:z
 # always will hold y=z
-AC_SUBST(LIBPULSE_VERSION_INFO, [17:0:17])
+AC_SUBST(LIBPULSE_VERSION_INFO, [17:3:17])
 
 # A simplified, synchronous, ABI-stable interface for client
 # applications, for the version info x:y:z always will hold y=z

commit 46712c88be50756a6c2af696aab38cd1da56b6b2
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Sun Dec 8 14:18:00 2013 -0800

    protocol-native: Don't enumerate unlinked sinks and sources
    
    This makes sure that there is no window between pa_sink/source_new()
    and _put() where enumerating sinks/sources causes an assert (several
    calls in sink/source_get_info need a linked sink or source).

diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index 41b4b50..80e72a8 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -3588,11 +3588,13 @@ static void command_get_info_list(pa_pdispatch *pd, uint32_t command, uint32_t t
 
     if (i) {
         PA_IDXSET_FOREACH(p, i, idx) {
-            if (command == PA_COMMAND_GET_SINK_INFO_LIST)
-                sink_fill_tagstruct(c, reply, p);
-            else if (command == PA_COMMAND_GET_SOURCE_INFO_LIST)
-                source_fill_tagstruct(c, reply, p);
-            else if (command == PA_COMMAND_GET_CLIENT_INFO_LIST)
+            if (command == PA_COMMAND_GET_SINK_INFO_LIST) {
+                if (PA_SINK_IS_LINKED(((pa_sink *)p)->state))
+                    sink_fill_tagstruct(c, reply, p);
+            } else if (command == PA_COMMAND_GET_SOURCE_INFO_LIST) {
+                if (PA_SOURCE_IS_LINKED(((pa_source *)p)->state))
+                    source_fill_tagstruct(c, reply, p);
+            } else if (command == PA_COMMAND_GET_CLIENT_INFO_LIST)
                 client_fill_tagstruct(c, reply, p);
             else if (command == PA_COMMAND_GET_CARD_INFO_LIST)
                 card_fill_tagstruct(c, reply, p);