add new introspection data field for sinks/sources: a flags field which specifies...

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@661 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/polyp/def.h b/src/polyp/def.h
index 659b943b5a3085c4552f9c93c581653703c02995..1a7a20c3c26a67b452de973dc59f97e6f4dbf3d9 100644 (file)
--- a/src/polyp/def.h
+++ b/src/polyp/def.h
@@ -273,6 +273,18 @@ typedef enum pa_seek_mode {
     PA_SEEK_RELATIVE_END = 3,       /**< Seek relatively to the current end of the buffer queue. */
 } pa_seek_mode_t;
 
+/** Special sink flags. \since 0.8  */
+typedef enum pa_sink_flags {
+    PA_SINK_HW_VOLUME_CTRL = 1,   /**< Supports hardware volume control */
+    PA_SINK_LATENCY = 2           /**< Supports latency querying */
+} pa_sink_flags_t;
+
+/** Special source flags. \since 0.8  */
+typedef enum pa_source_flags {
+    PA_SOURCE_HW_VOLUME_CTRL = 1,  /**< Supports hardware volume control */
+    PA_SOURCE_LATENCY = 2          /**< Supports latency querying */
+} pa_source_flags_t;
+
 PA_C_DECL_END
 
 #endif

diff --git a/src/polyp/introspect.c b/src/polyp/introspect.c
index 6a28998c4ecca5e3d4a7dd3b6fd271f58a8a2d68..ea6133e1b13d412c068bd52dbe4609444ebb000b 100644 (file)
--- a/src/polyp/introspect.c
+++ b/src/polyp/introspect.c
@@ -135,6 +135,7 @@ static void context_get_sink_info_callback(pa_pdispatch *pd, uint32_t command, P
 
         eol = -1;
     } else {
+        uint32_t flags;
         
         while (!pa_tagstruct_eof(t)) {
             pa_sink_info i;
@@ -150,12 +151,15 @@ static void context_get_sink_info_callback(pa_pdispatch *pd, uint32_t command, P
                 pa_tagstruct_getu32(t, &i.monitor_source) < 0 ||
                 pa_tagstruct_gets(t, &i.monitor_source_name) < 0 ||
                 pa_tagstruct_get_usec(t, &i.latency) < 0 ||
-                pa_tagstruct_gets(t, &i.driver) < 0) {
+                pa_tagstruct_gets(t, &i.driver) < 0 ||
+                pa_tagstruct_getu32(t, &flags) < 0) {
                 
                 pa_context_fail(o->context, PA_ERR_PROTOCOL);
                 goto finish;
             }
 
+            i.flags = (pa_sink_flags_t) flags;
+
             if (o->callback) {
                 pa_sink_info_cb_t cb = (pa_sink_info_cb_t) o->callback;
                 cb(o->context, &i, 0, o->userdata);
@@ -242,6 +246,7 @@ static void context_get_source_info_callback(pa_pdispatch *pd, uint32_t command,
         
         while (!pa_tagstruct_eof(t)) {
             pa_source_info i;
+            uint32_t flags;
             
             if (pa_tagstruct_getu32(t, &i.index) < 0 ||
                 pa_tagstruct_gets(t, &i.name) < 0 ||
@@ -254,12 +259,15 @@ static void context_get_source_info_callback(pa_pdispatch *pd, uint32_t command,
                 pa_tagstruct_getu32(t, &i.monitor_of_sink) < 0 ||
                 pa_tagstruct_gets(t, &i.monitor_of_sink_name) < 0 ||
                 pa_tagstruct_get_usec(t, &i.latency) < 0 ||
-                pa_tagstruct_gets(t, &i.driver) < 0) {
+                pa_tagstruct_gets(t, &i.driver) < 0 ||
+                pa_tagstruct_getu32(t, &flags) < 0) {
                 
                 pa_context_fail(o->context, PA_ERR_PROTOCOL);
                 goto finish;
             }
 
+            i.flags = (pa_source_flags_t) flags;
+
             if (o->callback) {
                 pa_source_info_cb_t cb = (pa_source_info_cb_t) o->callback;
                 cb(o->context, &i, 0, o->userdata);

diff --git a/src/polyp/introspect.h b/src/polyp/introspect.h
index f1f0989ca51b60da82870e054c093b9a65203665..fb05cfb9d3dc5d019021b178afeb2278d622bc90 100644 (file)
--- a/src/polyp/introspect.h
+++ b/src/polyp/introspect.h
@@ -63,6 +63,7 @@ typedef struct pa_sink_info {
     const char *monitor_source_name;   /**< The name of the monitor source */
     pa_usec_t latency;                 /**< Length of filled playback buffer of this sink */
     const char *driver;                /**< Driver name. \since 0.8 */
+    pa_sink_flags_t flags;             /**< Flags \since 0.8 */
 } pa_sink_info;
 
 /** Callback prototype for pa_context_get_sink_info_by_name() and friends */
@@ -91,6 +92,7 @@ typedef struct pa_source_info {
     const char *monitor_of_sink_name;   /**< Name of the owning sink, or PA_INVALID_INDEX */
     pa_usec_t latency;                  /**< Length of filled record buffer of this source. \since 0.5 */
     const char *driver;                 /**< Driver name \since 0.8 */
+    pa_source_flags_t flags;            /**< Flags \since 0.8 */
 } pa_source_info;
 
 /** Callback prototype for pa_context_get_source_info_by_name() and friends */

diff --git a/src/polypcore/protocol-native.c b/src/polypcore/protocol-native.c
index 763873c258614cf0fc158ee0550ac58204945ab5..51280c8486a676de11829751c9e1724de074bcce 100644 (file)
--- a/src/polypcore/protocol-native.c
+++ b/src/polypcore/protocol-native.c
@@ -1232,6 +1232,7 @@ static void sink_fill_tagstruct(pa_tagstruct *t, pa_sink *sink) {
         PA_TAG_STRING, sink->monitor_source->name,
         PA_TAG_USEC, pa_sink_get_latency(sink),
         PA_TAG_STRING, sink->driver,
+        PA_TAG_U32, (sink->get_hw_volume ? PA_SINK_HW_VOLUME_CTRL : 0) | (sink->get_latency ? PA_SINK_LATENCY : 0),
         PA_TAG_INVALID);
 }
 
@@ -1251,6 +1252,7 @@ static void source_fill_tagstruct(pa_tagstruct *t, pa_source *source) {
         PA_TAG_STRING, source->monitor_of ? source->monitor_of->name : NULL,
         PA_TAG_USEC, pa_source_get_latency(source),
         PA_TAG_STRING, source->driver,
+        PA_TAG_U32, (source->get_hw_volume ? PA_SOURCE_HW_VOLUME_CTRL : 0) | (source->get_latency ? PA_SOURCE_LATENCY : 0),
         PA_TAG_INVALID);
 }