really fix API version API

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

diff --git a/configure.ac b/configure.ac
index 3a0675c3f8206c5f54a52c97508f06e83bf8cfcc..af7668473d685719cc103c93be19a5734c30f3bd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,8 @@ AM_INIT_AUTOMAKE([foreign -Wall])
 AC_SUBST(PA_MAJORMINOR, "$PACKAGE_VERSION")
 AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/polypaudio/])
 
+AC_SUBST(PA_API_VERSION, 6)
+
 if type -p stow > /dev/null && test -d /usr/local/stow ; then
    AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***])
    ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"

diff --git a/doc/todo b/doc/todo
index 439eb770f902ff840c2fda32ade399a400cb7315..bef5b82ae172f03289ad5d65e5ce8e5f67e30c71 100644 (file)
--- a/doc/todo
+++ b/doc/todo
@@ -9,7 +9,6 @@
 - improve module-oss-mmap latency measurement
 - pacat sample type args
 - filter capture data in client through alignment
-- add tunnel module for sources
 - add radio module
 - make autoload list use idxset
 - libwrap

diff --git a/polyp/pacat.c b/polyp/pacat.c
index 1eb37d4da9daf8e9ea168192d75e55e4fa195fc2..67242b265567c777128fdd54e928312c0adad65c 100644 (file)
--- a/polyp/pacat.c
+++ b/polyp/pacat.c
@@ -36,8 +36,9 @@
 #include <polyp/polyplib-error.h>
 #include <polyp/mainloop.h>
 #include <polyp/mainloop-signal.h>
+#include <polyp/polyplib-version.h>
 
-#if PA_API_VERSION != PA_API_VERSION_0_6
+#if PA_API_VERSION != 6
 #error Invalid Polypaudio API version
 #endif
 
@@ -107,7 +108,7 @@ static void stream_read_callback(struct pa_stream *s, const void*data, size_t le
         mainloop_api->io_enable(stdio_event, PA_IO_EVENT_OUTPUT);
 
     if (buffer) {
-        fprintf(stderr, "Buffer overrrun, dropping incoming data\n");
+        fprintf(stderr, "Buffer overrun, dropping incoming data\n");
         return;
     }
 
@@ -133,7 +134,7 @@ static void stream_state_callback(struct pa_stream *s, void *userdata) {
             
         case PA_STREAM_FAILED:
         default:
-            fprintf(stderr, "Stream errror: %s\n", pa_strerror(pa_context_errno(pa_stream_get_context(s))));
+            fprintf(stderr, "Stream error: %s\n", pa_strerror(pa_context_errno(pa_stream_get_context(s))));
             quit(1);
     }
 }

diff --git a/polyp/pactl.c b/polyp/pactl.c
index cf2f51c392d052f0420d9b8ea345c07accb13ab5..fbedc6fa8d9ce38df9c42d22bde874062e4e6724 100644 (file)
--- a/polyp/pactl.c
+++ b/polyp/pactl.c
@@ -41,7 +41,7 @@
 #include <polyp/mainloop-signal.h>
 #include <polyp/sample.h>
 
-#if PA_API_VERSION != PA_API_VERSION_0_6
+#if PA_API_VERSION != 6
 #error Invalid Polypaudio API version
 #endif
 

diff --git a/polyp/paplay.c b/polyp/paplay.c
index 89358a516c25d6cea9f061fffb350b516ad433a5..cc466e120181ab2291ad1de7da4a9ca8f98e358e 100644 (file)
--- a/polyp/paplay.c
+++ b/polyp/paplay.c
@@ -40,7 +40,7 @@
 #include <polyp/mainloop-signal.h>
 #include <polyp/polyplib-version.h>
 
-#if PA_API_VERSION != PA_API_VERSION_0_6
+#if PA_API_VERSION != 6
 #error Invalid Polypaudio API version
 #endif
 

diff --git a/polyp/polyplib-context.c b/polyp/polyplib-context.c
index d2fae0af9870b0a29f4d7a8e2fed5c30879ad32d..b736daa7d2b3a65ea4e49660f67db0e344935d94 100644 (file)
--- a/polyp/polyplib-context.c
+++ b/polyp/polyplib-context.c
@@ -676,10 +676,6 @@ struct pa_operation* pa_context_send_simple_command(struct pa_context *c, uint32
     return pa_operation_ref(o);
 }
 
-const char* pa_get_library_version(void) {
-    return PACKAGE_VERSION;
-}
-
 struct pa_operation* pa_context_set_default_sink(struct pa_context *c, const char *name, void(*cb)(struct pa_context*c, int success, void *userdata), void *userdata) {
     struct pa_tagstruct *t;
     struct pa_operation *o;
@@ -744,3 +740,8 @@ struct pa_operation* pa_context_set_name(struct pa_context *c, const char *name,
 
     return pa_operation_ref(o);
 }
+
+const char* pa_get_library_version(void) {
+    return PACKAGE_VERSION;
+}
+

diff --git a/polyp/polyplib-version.h.in b/polyp/polyplib-version.h.in
index b44dc0088119a7d2eb2678d44a14ffc5bd4e32a6..75798693e82d703628fb59faad40bb6c2e93d0b4 100644 (file)
--- a/polyp/polyplib-version.h.in
+++ b/polyp/polyplib-version.h.in
@@ -22,6 +22,8 @@
   USA.
 ***/
 
+/* WARNING: Make sure to edit the real source file polyplib-version.h.in! */
+
 /** \file
  * Define header version */
 
@@ -30,4 +32,12 @@ a macro and not a function, so it is impossible to get the pointer of
 it. */
 #define pa_get_headers_version() ("@PACKAGE_VERSION@")
 
+/** Return the version of the library the current application is linked to. */
+const char* pa_get_library_version(void);
+
+/** The current API version. Version 6 relates to polypaudio
+ * 0.6. Prior versions (i.e. Polypaudio 0.5.1 and older) have
+ * PA_API_VERSION undefined.  */
+#define PA_API_VERSION @PA_API_VERSION@
+
 #endif