- 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)
This commit is contained in:
dmitrykos 2011-03-08 17:20:07 +00:00
commit ff61de145b
3 changed files with 2 additions and 2 deletions

BIN
configure vendored

Binary file not shown.

View file

@ -267,7 +267,7 @@ case "${host_os}" in
if [[ "x$with_wasapi" = "xyes" ]]; then 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 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" 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" CFLAGS="$CFLAGS -I\$(top_srcdir)/src/common -I\$(top_srcdir)/src/hostapi/wasapi/mingw-include -UPA_USE_WASAPI -DPA_USE_WASAPI=1"
fi fi
;; ;;

View file

@ -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 // Findout if there are tail frames, flush them all before reading hardware
if ((available = PaUtil_GetRingBufferReadAvailable(stream->in.tailBuffer)) != 0) 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; void *buf1 = NULL, *buf2 = NULL;
// Limit desired to amount of requested frames // Limit desired to amount of requested frames