From 83a17cd9f4d8fdf0f4f8ed8857956d8dd8ce69bf Mon Sep 17 00:00:00 2001 From: Jasper Mackenzie Date: Wed, 8 Aug 2018 18:28:57 +1200 Subject: [PATCH 1/3] add device id to audioprobe output --- tests/audioprobe.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/audioprobe.cpp b/tests/audioprobe.cpp index 1b93908..c83d3a5 100644 --- a/tests/audioprobe.cpp +++ b/tests/audioprobe.cpp @@ -46,6 +46,7 @@ int main() info = audio.getDeviceInfo(i); std::cout << "\nDevice Name = " << info.name << '\n'; + std::cout << "Device ID = " << i << '\n'; if ( info.probed == false ) std::cout << "Probe Status = UNsuccessful\n"; else { From 4a75d6db73f71ee52d4170e4ff988093e496cd7e Mon Sep 17 00:00:00 2001 From: Stephen Sinclair Date: Wed, 15 Aug 2018 15:25:06 -0300 Subject: [PATCH 2/3] automake: Fix rtaudio.pc prefix variable --- CMakeLists.txt | 1 + rtaudio.pc.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e4060a..2ce3b4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -257,6 +257,7 @@ message(STATUS "Compiling with support for: ${apilist}") # PkgConfig file string(REPLACE ";" " " req "${PKGCONFIG_REQUIRES}") string(REPLACE ";" " " api "${API_DEFS}") +set(prefix ${CMAKE_INSTALL_PREFIX}) configure_file("rtaudio.pc.in" "rtaudio.pc" @ONLY) # Add install rule. diff --git a/rtaudio.pc.in b/rtaudio.pc.in index 7627780..0e81090 100644 --- a/rtaudio.pc.in +++ b/rtaudio.pc.in @@ -1,4 +1,4 @@ -prefix=@CMAKE_INSTALL_PREFIX@ +prefix=@prefix@ exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include/rtaudio From f9ba7c277eab1fd866097a88e583cde7239e575a Mon Sep 17 00:00:00 2001 From: Stephen Sinclair Date: Fri, 24 Aug 2018 08:13:23 -0300 Subject: [PATCH 3/3] Don't error on unused-function. Because of convertCharPointerToStdString for example. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index aab625a..322f1b4 100644 --- a/configure.ac +++ b/configure.ac @@ -86,8 +86,8 @@ AC_CHECK_HEADERS(sys/ioctl.h unistd.h) AS_IF([test "x${GXX}" = "xyes" ], [ CXXFLAGS="-Wall -Wextra ${CXXFLAGS}" AS_IF([ test "x${enable_debug}" = "xyes" ], [ - # Add -Werror in debug mode - CXXFLAGS="-Werror ${CXXFLAGS}" + # Add -Werror in debug mode (except unused-function) + CXXFLAGS="-Werror -Wno-error=unused-function ${CXXFLAGS}" ], [ # hide private symbols in non-debug mode visibility="-fvisibility=hidden"