wasapi:

 - fixed warning of incompatible type usage when ring-buffer is used for blocking interface
 - fixed compilation using MSYS with MinGW compiler (regenerate makefile with configure)

diff --git a/configure b/configure
index dcf1bdaabcae1dd4c9cac4d7b35cea796f17047f..6be02b4514688ca732ddcd6b4721b7d438654771 100755 (executable)
Binary files a/configure and b/configure differ

diff --git a/configure.in b/configure.in
index fe05bc22ba0489c915e2825dbeeeb00477a1d874..42a17f92a8ce829dedf1b97ff1de4ebb9a5a4c9a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -267,7 +267,7 @@ case "${host_os}" in
         if [[ "x$with_wasapi" = "xyes" ]]; then
             add_objects src/hostapi/wasapi/pa_win_wasapi.o src/common/pa_ringbuffer.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_waveformat.o
             LIBS="-lwinmm -lm -lole32 -luuid"
-            DLL_LIBS="${DLL_LIBS} -lwinmm"
+            DLL_LIBS="${DLL_LIBS} -lwinmm -lole32"
             CFLAGS="$CFLAGS -I\$(top_srcdir)/src/common -I\$(top_srcdir)/src/hostapi/wasapi/mingw-include -UPA_USE_WASAPI -DPA_USE_WASAPI=1"
         fi
         ;;

diff --git a/src/hostapi/wasapi/pa_win_wasapi.c b/src/hostapi/wasapi/pa_win_wasapi.c
index 180f9249b186b77267efe55b961326944d0fb388..b8fda8fcbe0a2a82c1ede6e971539d4089b75923 100644 (file)
--- a/src/hostapi/wasapi/pa_win_wasapi.c
+++ b/src/hostapi/wasapi/pa_win_wasapi.c
@@ -3481,7 +3481,7 @@ static PaError ReadStream( PaStream* s, void *_buffer, unsigned long frames )
        // Findout if there are tail frames, flush them all before reading hardware\r
        if ((available = PaUtil_GetRingBufferReadAvailable(stream->in.tailBuffer)) != 0)\r
        {\r
-               UINT32 buf1_size = 0, buf2_size = 0, read, desired;\r
+               ring_buffer_size_t buf1_size = 0, buf2_size = 0, read, desired;\r
                void *buf1 = NULL, *buf2 = NULL;\r
 \r
                // Limit desired to amount of requested frames\r