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
This commit is contained in:
Lennart Poettering 2006-08-01 21:04:43 +00:00
parent bc30e2d934
commit 7f93d08d40
7 changed files with 9 additions and 6 deletions

View file

@ -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])

View file

@ -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 */
};

View file

@ -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);

View file

@ -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

View file

@ -37,7 +37,7 @@
#include <pulse/pulseaudio.h>
#if PA_API_VERSION != 9
#if PA_API_VERSION < 10
#error Invalid PulseAudio API version
#endif

View file

@ -37,7 +37,7 @@
#include <pulse/pulseaudio.h>
#if PA_API_VERSION != 9
#if PA_API_VERSION < 9
#error Invalid PulseAudio API version
#endif

2
todo
View file

@ -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