From: dmitrykos <dmitrykos@0f58301d-fd10-0410-b4af-bbb618454e57>
Date: Tue, 8 Mar 2011 17:20:07 +0000 (+0000)
Subject: wasapi:
X-Git-Tag: pa_stable_v19_20110326_r1647~5
X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=ff61de145be389e5f9f378ce5aa6b7d9077c54e4;p=portaudio

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 dcf1bda..6be02b4 100755
Binary files a/configure and b/configure differ
diff --git a/configure.in b/configure.in
index fe05bc2..42a17f9 100644
--- 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 180f924..b8fda8f 100644
--- 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
 	if ((available = PaUtil_GetRingBufferReadAvailable(stream->in.tailBuffer)) != 0)
 	{
-		UINT32 buf1_size = 0, buf2_size = 0, read, desired;
+		ring_buffer_size_t buf1_size = 0, buf2_size = 0, read, desired;
 		void *buf1 = NULL, *buf2 = NULL;
 
 		// Limit desired to amount of requested frames