[pulseaudio-discuss] [PATCH] Update the protocol version of the node interface

[Tanu Kaskinen]

Protocol version 29 will correspond to PA 5.0, and the node stuff has
been postponed until 6.0, so the node interface needs to bump the
protocol version to 30.
---
 PROTOCOL                      |  2 ++
 configure.ac                  |  2 +-
 src/pulse/introspect.c        |  6 +++---
 src/pulse/introspect.h        | 10 +++++-----
 src/pulsecore/native-common.h |  2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/PROTOCOL b/PROTOCOL
index d953b05..08e4583 100644
--- a/PROTOCOL
+++ b/PROTOCOL
@@ -351,6 +351,8 @@ New field in all commands that send/receive profile introspection data
 
 The field is added once for every profile.
 
+## v30, implemented by >= 6.0
+
 New client->server commands:
     GET_NODE_INFO
     GET_NODE_INFO_LIST
diff --git a/configure.ac b/configure.ac
index 616a990..c87ce26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ AC_SUBST(PA_MINOR, pa_minor)
 AC_SUBST(PA_MAJORMINOR, pa_major.pa_minor)
 
 AC_SUBST(PA_API_VERSION, 12)
-AC_SUBST(PA_PROTOCOL_VERSION, 29)
+AC_SUBST(PA_PROTOCOL_VERSION, 30)
 
 # The stable ABI for client applications, for the version info x:y:z
 # always will hold y=z
diff --git a/src/pulse/introspect.c b/src/pulse/introspect.c
index 8aceeeb..23114f3 100644
--- a/src/pulse/introspect.c
+++ b/src/pulse/introspect.c
@@ -1846,7 +1846,7 @@ pa_operation *pa_context_get_node_info_by_name(pa_context *c, const char *name,
 
     PA_CHECK_VALIDITY_RETURN_NULL(c, !pa_detect_fork(), PA_ERR_FORKED);
     PA_CHECK_VALIDITY_RETURN_NULL(c, c->state == PA_CONTEXT_READY, PA_ERR_BADSTATE);
-    PA_CHECK_VALIDITY_RETURN_NULL(c, c->version >= 29, PA_ERR_NOTSUPPORTED);
+    PA_CHECK_VALIDITY_RETURN_NULL(c, c->version >= 30, PA_ERR_NOTSUPPORTED);
 
     o = pa_operation_new(c, NULL, (pa_operation_cb_t) cb, userdata);
 
@@ -1870,7 +1870,7 @@ pa_operation *pa_context_get_node_info_by_index(pa_context *c, uint32_t idx, pa_
 
     PA_CHECK_VALIDITY_RETURN_NULL(c, !pa_detect_fork(), PA_ERR_FORKED);
     PA_CHECK_VALIDITY_RETURN_NULL(c, c->state == PA_CONTEXT_READY, PA_ERR_BADSTATE);
-    PA_CHECK_VALIDITY_RETURN_NULL(c, c->version >= 29, PA_ERR_NOTSUPPORTED);
+    PA_CHECK_VALIDITY_RETURN_NULL(c, c->version >= 30, PA_ERR_NOTSUPPORTED);
 
     o = pa_operation_new(c, NULL, (pa_operation_cb_t) cb, userdata);
 
@@ -1886,7 +1886,7 @@ pa_operation *pa_context_get_node_info_by_index(pa_context *c, uint32_t idx, pa_
 pa_operation *pa_context_get_node_info_list(pa_context *c, pa_node_info_cb_t cb, void *userdata) {
     pa_assert(c);
 
-    PA_CHECK_VALIDITY_RETURN_NULL(c, c->version >= 29, PA_ERR_NOTSUPPORTED);
+    PA_CHECK_VALIDITY_RETURN_NULL(c, c->version >= 30, PA_ERR_NOTSUPPORTED);
 
     return pa_context_send_simple_command(c, PA_COMMAND_GET_NODE_INFO_LIST, context_get_node_info_callback, (pa_operation_cb_t) cb, userdata);
 }
diff --git a/src/pulse/introspect.h b/src/pulse/introspect.h
index 0c02eef..61f47d9 100644
--- a/src/pulse/introspect.h
+++ b/src/pulse/introspect.h
@@ -676,7 +676,7 @@ pa_operation* pa_context_get_sample_info_list(pa_context *c, pa_sample_info_cb_t
 /** Routing node information. Please note that this structure can be extended
  * as part of evolutionary API updates at any time in any new release.
  *
- * \since 5.0 */
+ * \since 6.0 */
 typedef struct pa_node_info {
     /** The index of this node. */
     uint32_t index;
@@ -698,16 +698,16 @@ typedef struct pa_node_info {
 } pa_node_info;
 
 /** Callback prototype for pa_context_get_node_info_by_name() and friends.
- * \since 5.0 */
+ * \since 6.0 */
 typedef void (*pa_node_info_cb_t)(pa_context *c, const pa_node_info *info, int eol, void *userdata);
 
-/** Get information about a node by its name. \since 5.0 */
+/** Get information about a node by its name. \since 6.0 */
 pa_operation *pa_context_get_node_info_by_name(pa_context *c, const char *name, pa_node_info_cb_t cb, void *userdata);
 
-/** Get information about a node by its index. \since 5.0 */
+/** Get information about a node by its index. \since 6.0 */
 pa_operation *pa_context_get_node_info_by_index(pa_context *c, uint32_t idx, pa_node_info_cb_t cb, void *userdata);
 
-/** Get a list of all nodes. \since 5.0 */
+/** Get a list of all nodes. \since 6.0 */
 pa_operation *pa_context_get_node_info_list(pa_context *c, pa_node_info_cb_t cb, void *userdata);
 
 /** @} */
diff --git a/src/pulsecore/native-common.h b/src/pulsecore/native-common.h
index 7898118..40a507e 100644
--- a/src/pulsecore/native-common.h
+++ b/src/pulsecore/native-common.h
@@ -176,7 +176,7 @@ enum {
     /* Supported since protocol v27 (3.0) */
     PA_COMMAND_SET_PORT_LATENCY_OFFSET,
 
-    /* Supported since protocol v29 (5.0) */
+    /* Supported since protocol v30 (6.0) */
     PA_COMMAND_GET_NODE_INFO,
     PA_COMMAND_GET_NODE_INFO_LIST,
 
-- 
1.8.1.2