[pulseaudio-commits] r1179 - in /trunk: configure.ac src/pulse/def.h src/pulse/introspect.c src/utils/pacat.c src/utils/pactl.c src/utils/paplay.c todo

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Tue Aug  1 23:04:43 2006
New Revision: 1179

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1179&root=pulseaudio&view=rev
Log:
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

Modified:
    trunk/configure.ac
    trunk/src/pulse/def.h
    trunk/src/pulse/introspect.c
    trunk/src/utils/pacat.c
    trunk/src/utils/pactl.c
    trunk/src/utils/paplay.c
    trunk/todo

Modified: trunk/configure.ac
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/configure.ac?rev=1179&root=pulseaudio&r1=1178&r2=1179&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Aug  1 23:04:43 2006
@@ -33,8 +33,8 @@
 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])

Modified: trunk/src/pulse/def.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/def.h?rev=1179&root=pulseaudio&r1=1178&r2=1179&view=diff
==============================================================================
--- trunk/src/pulse/def.h (original)
+++ trunk/src/pulse/def.h Tue Aug  1 23:04:43 2006
@@ -161,6 +161,7 @@
     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 */
 };
 

Modified: trunk/src/pulse/introspect.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/introspect.c?rev=1179&root=pulseaudio&r1=1178&r2=1179&view=diff
==============================================================================
--- trunk/src/pulse/introspect.c (original)
+++ trunk/src/pulse/introspect.c Tue Aug  1 23:04:43 2006
@@ -1248,6 +1248,7 @@
     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 @@
     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);
 

Modified: trunk/src/utils/pacat.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/pacat.c?rev=1179&root=pulseaudio&r1=1178&r2=1179&view=diff
==============================================================================
--- trunk/src/utils/pacat.c (original)
+++ trunk/src/utils/pacat.c Tue Aug  1 23:04:43 2006
@@ -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
 

Modified: trunk/src/utils/pactl.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/pactl.c?rev=1179&root=pulseaudio&r1=1178&r2=1179&view=diff
==============================================================================
--- trunk/src/utils/pactl.c (original)
+++ trunk/src/utils/pactl.c Tue Aug  1 23:04:43 2006
@@ -37,7 +37,7 @@
 
 #include <pulse/pulseaudio.h>
 
-#if PA_API_VERSION != 9
+#if PA_API_VERSION < 10
 #error Invalid PulseAudio API version
 #endif
 

Modified: trunk/src/utils/paplay.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/paplay.c?rev=1179&root=pulseaudio&r1=1178&r2=1179&view=diff
==============================================================================
--- trunk/src/utils/paplay.c (original)
+++ trunk/src/utils/paplay.c Tue Aug  1 23:04:43 2006
@@ -37,7 +37,7 @@
 
 #include <pulse/pulseaudio.h>
 
-#if PA_API_VERSION != 9
+#if PA_API_VERSION < 9
 #error Invalid PulseAudio API version
 #endif
 

Modified: trunk/todo
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/todo?rev=1179&root=pulseaudio&r1=1178&r2=1179&view=diff
==============================================================================
--- trunk/todo (original)
+++ trunk/todo Tue Aug  1 23:04:43 2006
@@ -28,7 +28,7 @@
 - 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