summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-08-01 21:04:43 +0000
committerLennart Poettering <lennart@poettering.net>2006-08-01 21:04:43 +0000
commit7f93d08d4014cc68965611068c47834c1e5547ef (patch)
tree2d22b3cef924c3cf090b4b9a5aa10c04bc8d2760 /src
parentbc30e2d9346edad2c8a755656e9aec803227bde1 (diff)
bump API and protocol version. Return PA_ERR_NOTSUPPORTED if pa_context_move_sink_input_by_*()is called for servers that don't support it
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1179 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src')
-rw-r--r--src/pulse/def.h1
-rw-r--r--src/pulse/introspect.c2
-rw-r--r--src/utils/pacat.c2
-rw-r--r--src/utils/pactl.c2
-rw-r--r--src/utils/paplay.c2
5 files changed, 6 insertions, 3 deletions
diff --git a/src/pulse/def.h b/src/pulse/def.h
index 01ed0f6d..a22e3c19 100644
--- 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 8aaf8b3f..d750bbde 100644
--- 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 dda5c192..1c581f4d 100644
--- 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 3674f950..0fde33eb 100644
--- 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 7b34016c..0386c9df 100644
--- 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