bump API and protocol version. Return PA_ERR_NOTSUPPORTED if pa_context_move_sink_inp...

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

diff --git a/configure.ac b/configure.ac
index e6b09c5394349710e6f79d41ff24fd86a0c8e0ee..26fd860cb4d18e8722493e149d7fc16053a72752 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,8 +33,8 @@ AM_INIT_AUTOMAKE([foreign -Wall])
 AC_SUBST(PA_MAJORMINOR, "PA_MAJOR.PA_MINOR")
 AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/pulseaudio/])
 
-AC_SUBST(PA_API_VERSION, 9)
-AC_SUBST(PA_PROTOCOL_VERSION, 9)
+AC_SUBST(PA_API_VERSION, 10)
+AC_SUBST(PA_PROTOCOL_VERSION, 10)
 
 AC_SUBST(LIBPULSE_VERSION_INFO, [0:2:0])
 AC_SUBST(LIBPULSECORE_VERSION_INFO, [1:1:0])

diff --git a/src/pulse/def.h b/src/pulse/def.h
index 01ed0f6d089b893c98fa5198fb36dcd45418493f..a22e3c1908c0b7263bde6ff664386b23c1435cb4 100644 (file)
--- a/src/pulse/def.h
+++ b/src/pulse/def.h
@@ -161,6 +161,7 @@ enum {
     PA_ERR_NODATA,                 /**< No data */
     PA_ERR_VERSION,                /**< Incompatible protocol version \since 0.8 */
     PA_ERR_TOOLARGE,               /**< Data too large \since 0.8.1 */
+    PA_ERR_NOTSUPPORTED,           /**< Operation not supported \since 0.9.5 */
     PA_ERR_MAX                     /**< Not really an error but the first invalid error code */
 };
 

diff --git a/src/pulse/introspect.c b/src/pulse/introspect.c
index 8aaf8b3f1c558b0f8d644d1c4f5d9942dedcb63e..d750bbdea411559ebb960f1abc62c9fa7dbb64a3 100644 (file)
--- a/src/pulse/introspect.c
+++ b/src/pulse/introspect.c
@@ -1248,6 +1248,7 @@ pa_operation* pa_context_move_sink_input_by_name(pa_context *c, uint32_t idx, ch
     assert(c->ref >= 1);
 
     PA_CHECK_VALIDITY_RETURN_NULL(c, c->state == PA_CONTEXT_READY, PA_ERR_BADSTATE);
+    PA_CHECK_VALIDITY_RETURN_NULL(c, c->version >= 10, PA_ERR_NOTSUPPORTED);
     PA_CHECK_VALIDITY_RETURN_NULL(c, idx != PA_INVALID_INDEX, PA_ERR_INVALID);
     PA_CHECK_VALIDITY_RETURN_NULL(c, sink_name && *sink_name, PA_ERR_INVALID);
 
@@ -1272,6 +1273,7 @@ pa_operation* pa_context_move_sink_input_by_index(pa_context *c, uint32_t idx, u
     assert(c->ref >= 1);
 
     PA_CHECK_VALIDITY_RETURN_NULL(c, c->state == PA_CONTEXT_READY, PA_ERR_BADSTATE);
+    PA_CHECK_VALIDITY_RETURN_NULL(c, c->version >= 10, PA_ERR_NOTSUPPORTED);
     PA_CHECK_VALIDITY_RETURN_NULL(c, idx != PA_INVALID_INDEX, PA_ERR_INVALID);
     PA_CHECK_VALIDITY_RETURN_NULL(c, sink_idx != PA_INVALID_INDEX, PA_ERR_INVALID);
 

diff --git a/src/utils/pacat.c b/src/utils/pacat.c
index dda5c192938505f0cdd5b52ee5e7a0a0ae3b8efe..1c581f4d9ef6a9cb26b2ffb259aa85a09fbcd11b 100644 (file)
--- a/src/utils/pacat.c
+++ b/src/utils/pacat.c
@@ -37,7 +37,7 @@
 
 #define TIME_EVENT_USEC 50000
 
-#if PA_API_VERSION != 9
+#if PA_API_VERSION < 9
 #error Invalid PulseAudio API version
 #endif
 

diff --git a/src/utils/pactl.c b/src/utils/pactl.c
index 3674f950f7fbecf86dbfdda426b9721e81383f76..0fde33eb5f67c1257087ee5f35314647bccdd6a0 100644 (file)
--- a/src/utils/pactl.c
+++ b/src/utils/pactl.c
@@ -37,7 +37,7 @@
 
 #include <pulse/pulseaudio.h>
 
-#if PA_API_VERSION != 9
+#if PA_API_VERSION < 10
 #error Invalid PulseAudio API version
 #endif
 

diff --git a/src/utils/paplay.c b/src/utils/paplay.c
index 7b34016c53eeff318c95deb55712c484856e15cd..0386c9df8df6a231643cd30ce6adf2a62162342c 100644 (file)
--- a/src/utils/paplay.c
+++ b/src/utils/paplay.c
@@ -37,7 +37,7 @@
 
 #include <pulse/pulseaudio.h>
 
-#if PA_API_VERSION != 9
+#if PA_API_VERSION < 9
 #error Invalid PulseAudio API version
 #endif
 

diff --git a/todo b/todo
index 8d0105f596b6efa5eca57d0f6841f3327244979b..cdd8b87210d2563f511fb12aaa0a13b2959f8d48 100644 (file)
--- a/todo
+++ b/todo
@@ -28,7 +28,7 @@ Post 0.9.0:
 - Document utf8.h, timeval.h and util.h
 - gettextify polypaudio
 - drop dependency of libpolyp on libX11, instead use an external mini binary
-- "hot" moving of streams between sinks
+- "hot" moving of recording streams between sources
 - hooks for creating sink inputs
 - insert the low-level device name in the default sink/source name, to make them recognizable
 - ssl