Warnings/errors "unused function" are from the unicode conversion functions on Windows, and "unused but set variable" is from ASIO source code; we disable these warnings on Windows builds.tags/5.1.0
@@ -30,28 +30,28 @@ matrix: | |||||
env: HOST="" API="oss" | env: HOST="" API="oss" | ||||
compiler: clang | compiler: clang | ||||
- os: linux | - os: linux | ||||
env: HOST="--host=i686-w64-mingw32" API="winmm" | |||||
env: HOST="--host=i686-w64-mingw32" API="winmm" CPPFLAGS="-Wno-unused-function" | |||||
compiler: gcc | compiler: gcc | ||||
- os: linux | - os: linux | ||||
env: HOST="--host=x86_64-w64-mingw32" API="winmm" | |||||
env: HOST="--host=x86_64-w64-mingw32" API="winmm" CPPFLAGS="-Wno-unused-function" | |||||
compiler: gcc | compiler: gcc | ||||
- os: linux | - os: linux | ||||
env: HOST="--host=i686-w64-mingw32" API="dsound" | |||||
env: HOST="--host=i686-w64-mingw32" API="dsound" CPPFLAGS="-Wno-unused-function" | |||||
compiler: gcc | compiler: gcc | ||||
- os: linux | - os: linux | ||||
env: HOST="--host=x86_64-w64-mingw32" API="dsound" | |||||
env: HOST="--host=x86_64-w64-mingw32" API="dsound" CPPFLAGS="-Wno-unused-function" | |||||
compiler: gcc | compiler: gcc | ||||
- os: linux | - os: linux | ||||
env: HOST="--host=i686-w64-mingw32" API="asio" | |||||
env: HOST="--host=i686-w64-mingw32" API="asio" CPPFLAGS="-Wno-unused-function -Wno-unused-but-set-variable" | |||||
compiler: gcc | compiler: gcc | ||||
- os: linux | - os: linux | ||||
env: HOST="--host=x86_64-w64-mingw32" API="asio" | |||||
env: HOST="--host=x86_64-w64-mingw32" API="asio" CPPFLAGS="-Wno-unused-function -Wno-unused-but-set-variable" | |||||
compiler: gcc | compiler: gcc | ||||
- os: linux | - os: linux | ||||
env: HOST="--host=i686-w64-mingw32" API="wasapi" | |||||
env: HOST="--host=i686-w64-mingw32" API="wasapi" CPPFLAGS="-Wno-unused-function" | |||||
compiler: gcc | compiler: gcc | ||||
- os: linux | - os: linux | ||||
env: HOST="--host=x86_64-w64-mingw32" API="wasapi" | |||||
env: HOST="--host=x86_64-w64-mingw32" API="wasapi" CPPFLAGS="-Wno-unused-function" | |||||
compiler: gcc | compiler: gcc | ||||
# jack and asound not found on ARM gnueabihf | # jack and asound not found on ARM gnueabihf | ||||
# - os: linux | # - os: linux | ||||
@@ -13,10 +13,10 @@ lib_LTLIBRARIES = %D%/librtaudio.la | |||||
if ASIO | if ASIO | ||||
%C%_librtaudio_la_SOURCES += \ | %C%_librtaudio_la_SOURCES += \ | ||||
asio.cpp \ | |||||
asiodrivers.cpp \ | |||||
asiolist.cpp \ | |||||
iasiothiscallresolver.cpp | |||||
include/asio.cpp \ | |||||
include/asiodrivers.cpp \ | |||||
include/asiolist.cpp \ | |||||
include/iasiothiscallresolver.cpp | |||||
endif | endif | ||||
rtaudio_incdir = $(includedir)/rtaudio | rtaudio_incdir = $(includedir)/rtaudio | ||||
@@ -4458,7 +4458,7 @@ bool RtApiWasapi::probeDeviceOpen( unsigned int device, StreamMode mode, unsigne | |||||
if ( sampleRate != deviceInfo.preferredSampleRate ) | if ( sampleRate != deviceInfo.preferredSampleRate ) | ||||
{ | { | ||||
errorType = RtAudioError::INVALID_USE; | errorType = RtAudioError::INVALID_USE; | ||||
std::stringstring ss; | |||||
std::stringstream ss; | |||||
ss << "RtApiWasapi::probeDeviceOpen: " << sampleRate | ss << "RtApiWasapi::probeDeviceOpen: " << sampleRate | ||||
<< "Hz sample rate not supported. This device only supports " | << "Hz sample rate not supported. This device only supports " | ||||
<< deviceInfo.preferredSampleRate << "Hz."; | << deviceInfo.preferredSampleRate << "Hz."; | ||||
@@ -226,6 +226,7 @@ AS_CASE([$host], | |||||
AC_MSG_RESULT([using ASIO]) | AC_MSG_RESULT([using ASIO]) | ||||
api="$api -D__WINDOWS_ASIO__" | api="$api -D__WINDOWS_ASIO__" | ||||
use_asio=yes | use_asio=yes | ||||
CPPFLAGS="-I$srcdir/include $CPPFLAGS" | |||||
]) | ]) | ||||
# Look for DirectSound flag | # Look for DirectSound flag | ||||
AS_IF([test "x$with_ds" = "xyes" ], [ | AS_IF([test "x$with_ds" = "xyes" ], [ | ||||
@@ -238,6 +239,7 @@ AS_CASE([$host], | |||||
AC_MSG_RESULT([using WASAPI]) | AC_MSG_RESULT([using WASAPI]) | ||||
api="$api -D__WINDOWS_WASAPI__" | api="$api -D__WINDOWS_WASAPI__" | ||||
LIBS="-lwinmm -luuid -lksuser $LIBS" | LIBS="-lwinmm -luuid -lksuser $LIBS" | ||||
CPPFLAGS="-I$srcdir/include $CPPFLAGS" | |||||
]) | ]) | ||||
# If no audio api flags specified, use DS | # If no audio api flags specified, use DS | ||||
AS_IF([test "x$api" = "x" ], [ | AS_IF([test "x$api" = "x" ], [ | ||||