[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.15-test3-30-g297515a

[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  f8a085f5cfb9388a813773fbfa9598699bd6131c (commit)

- Log -----------------------------------------------------------------
297515a... pass profile priority value to clients
-----------------------------------------------------------------------

Summary of changes:
 src/pulse/introspect.c          |    3 ++-
 src/pulse/introspect.h          |    1 +
 src/pulsecore/protocol-native.c |    1 +
 src/utils/pactl.c               |    2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

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

commit 297515a39eebfbd9e846c9d45bebe3890a39fb02
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Mar 3 00:32:10 2009 +0100

    pass profile priority value to clients

diff --git a/src/pulse/introspect.c b/src/pulse/introspect.c
index befeb24..6d6e3a3 100644
--- a/src/pulse/introspect.c
+++ b/src/pulse/introspect.c
@@ -528,7 +528,8 @@ static void context_get_card_info_callback(pa_pdispatch *pd, uint32_t command, u
                     if (pa_tagstruct_gets(t, &i.profiles[j].name) < 0 ||
                         pa_tagstruct_gets(t, &i.profiles[j].description) < 0 ||
                         pa_tagstruct_getu32(t, &i.profiles[j].n_sinks) < 0 ||
-                        pa_tagstruct_getu32(t, &i.profiles[j].n_sources)< 0) {
+                        pa_tagstruct_getu32(t, &i.profiles[j].n_sources) < 0 ||
+                        pa_tagstruct_getu32(t, &i.profiles[j].priority) < 0) {
 
                         pa_context_fail(o->context, PA_ERR_PROTOCOL);
                         pa_xfree(i.profiles);
diff --git a/src/pulse/introspect.h b/src/pulse/introspect.h
index aa67e43..60f8d4f 100644
--- a/src/pulse/introspect.h
+++ b/src/pulse/introspect.h
@@ -401,6 +401,7 @@ typedef struct pa_card_profile_info {
     const char *description;            /**< Description of this profile */
     uint32_t n_sinks;                   /**< Number of sinks this profile would create */
     uint32_t n_sources;                 /**< Number of sources this profile would create */
+    uint32_t priority;                  /**< The higher this value is the more useful this profile is as a default */
 } pa_card_profile_info;
 
 /** Stores information about cards. Please note that this structure
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index a0fdd60..eec36bc 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -2829,6 +2829,7 @@ static void card_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_car
             pa_tagstruct_puts(t, p->description);
             pa_tagstruct_putu32(t, p->n_sinks);
             pa_tagstruct_putu32(t, p->n_sources);
+            pa_tagstruct_putu32(t, p->priority);
         }
     }
 
diff --git a/src/utils/pactl.c b/src/utils/pactl.c
index 6524bf9..269dbfa 100644
--- a/src/utils/pactl.c
+++ b/src/utils/pactl.c
@@ -427,7 +427,7 @@ static void get_card_info_callback(pa_context *c, const pa_card_info *i, int is_
 
         printf(_("\tProfiles:\n"));
         for (p = i->profiles; p->name; p++)
-            printf("\t\t%s: %s\n", p->name, p->description);
+            printf("\t\t%s: %s (sinks: %u, sources: %u, priority. %u)\n", p->name, p->description, p->n_sinks, p->n_sources, p->priority);
     }
 
     if (i->active_profile)

-- 
hooks/post-receive
PulseAudio Sound Server