From 023b6df93267bc1f50da05d2ed424d658e3c9390 Mon Sep 17 00:00:00 2001 From: nasso <11479594+nasso@users.noreply.github.com> Date: Thu, 10 Jun 2021 23:31:22 +0200 Subject: [PATCH 1/3] Update CMakeLists.txt --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 953d17e..4ca2371 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,12 +8,12 @@ include(CXXhelpers) if (CMAKE_OSX_ARCHITECTURES) if(CMAKE_OSX_SYSROOT MATCHES ".*iphoneos.*") # RtAudio is not portable to ios currently - option(BUILD_EXAMPLE "Build example application" OFF) + option(LIBNYQUIST_BUILD_EXAMPLE "Build example application" OFF) else() - option(BUILD_EXAMPLE "Build example application" ON) + option(LIBNYQUIST_BUILD_EXAMPLE "Build example application" ON) endif() else() - option(BUILD_EXAMPLE "Build example application" ON) + option(LIBNYQUIST_BUILD_EXAMPLE "Build example application" ON) endif() #------------------------------------------------------------------------------- @@ -237,7 +237,7 @@ source_group(src FILES ${nyquist_src}) # libnyquist-examples -if(BUILD_EXAMPLE) +if(LIBNYQUIST_BUILD_EXAMPLE) set(NQR_EXAMPLE_APP_NAME "libnyquist-examples") From c07db169f1423e6199b2899516b789c7fb58057f Mon Sep 17 00:00:00 2001 From: nasso Date: Sat, 12 Jun 2021 00:31:34 +0200 Subject: [PATCH 2/3] Silence warnings when including Common.h --- include/libnyquist/Common.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/include/libnyquist/Common.h b/include/libnyquist/Common.h index 050f146..8847ae9 100644 --- a/include/libnyquist/Common.h +++ b/include/libnyquist/Common.h @@ -26,6 +26,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef LIBNYQUIST_COMMON_H #define LIBNYQUIST_COMMON_H +#if defined(__GNUC__) || defined(__MINGW32__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-parameter" +#elif defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable: 4244) // conversion from X to Y, possible loss of data +#pragma warning(disable: 4100) // unreferenced formal parameter +#endif + #include #include #include @@ -402,7 +411,7 @@ enum WaveFormatCode FORMAT_ADPCM = 0x2, // Microsoft ADPCM Format FORMAT_IEEE = 0x3, // IEEE float/double FORMAT_ALAW = 0x6, // 8-bit ITU-T G.711 A-law - FORMAT_MULAW = 0x7, // 8-bit ITU-T G.711 µ-law + FORMAT_MULAW = 0x7, // 8-bit ITU-T G.711 �-law FORMAT_IMA_ADPCM = 0x11, // IMA ADPCM Format FORMAT_EXT = 0xFFFE // Set via subformat }; @@ -691,4 +700,10 @@ inline void TrimSilenceInterleaved(std::vector & buffer, float v, bool fr } // end namespace nqr +#if defined(__GNUC__) || defined(__MINGW32__) +#pragma GCC diagnostic pop +#elif defined(_MSC_VER) +#pragma warning(pop) +#endif + #endif From 4ba66dc6f2b99abd2d087fdf3e0ebe65ae563a09 Mon Sep 17 00:00:00 2001 From: nasso <11479594+nasso@users.noreply.github.com> Date: Tue, 25 Jan 2022 12:29:29 +0100 Subject: [PATCH 3/3] =?UTF-8?q?Fix=20=C2=B5-law=20character=20in=20comment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/libnyquist/Common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/libnyquist/Common.h b/include/libnyquist/Common.h index 8847ae9..01b884a 100644 --- a/include/libnyquist/Common.h +++ b/include/libnyquist/Common.h @@ -411,7 +411,7 @@ enum WaveFormatCode FORMAT_ADPCM = 0x2, // Microsoft ADPCM Format FORMAT_IEEE = 0x3, // IEEE float/double FORMAT_ALAW = 0x6, // 8-bit ITU-T G.711 A-law - FORMAT_MULAW = 0x7, // 8-bit ITU-T G.711 �-law + FORMAT_MULAW = 0x7, // 8-bit ITU-T G.711 µ-law FORMAT_IMA_ADPCM = 0x11, // IMA ADPCM Format FORMAT_EXT = 0xFFFE // Set via subformat };