From: Nick Appleton Date: Thu, 15 Sep 2016 12:52:44 +0000 (+1000) Subject: address all problems picked up by cmakelint except for line-length related comments... X-Git-Tag: pa_stable_v190600_20161030~7^2 X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=0c10cb6c0cd2b34ff35d8e5fb011ca7481c20a2a;p=portaudio address all problems picked up by cmakelint except for line-length related comments. don't use min() in paex_record_file as it is a macro specific to windows. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index a4b729c..90770c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,10 +31,10 @@ IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_LIST_DIR}) CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) IF(${flag_var} MATCHES "/MD") STRING(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") - ENDIF(${flag_var} MATCHES "/MD") - ENDFOREACH(flag_var) - ENDIF(PA_DLL_LINK_WITH_STATIC_RUNTIME) - ENDIF(WIN32 AND MSVC) + ENDIF() + ENDFOREACH() + ENDIF() + ENDIF() ENDIF() SET(PA_PKGCONFIG_VERSION 19) @@ -114,7 +114,7 @@ SET(PA_PRIVATE_INCLUDE_PATHS src/common ${CMAKE_CURRENT_BINARY_DIR}) IF(WIN32) SET(PA_PRIVATE_COMPILE_DEFINITIONS ${PA_PRIVATE_COMPILE_DEFINITIONS} _CRT_SECURE_NO_WARNINGS) - SET(PA_PLATFORM_SOURCES + SET(PA_PLATFORM_SOURCES src/os/win/pa_win_hostapis.c src/os/win/pa_win_util.c src/os/win/pa_win_waveformat.c @@ -130,7 +130,7 @@ IF(WIN32) ELSE() SET(PA_PRIVATE_COMPILE_DEFINITIONS ${PA_PRIVATE_COMPILE_DEFINITIONS} _WIN32_WINNT=0x0501 WINVER=0x0501) SET(DEF_EXCLUDE_X86_PLAIN_CONVERTERS ";") - ENDIF(MSVC) + ENDIF() SOURCE_GROUP("os\\win" FILES ${PA_PLATFORM_SOURCES} ${PA_PLATFORM_INCLUDES}) SET(PA_SOURCES ${PA_SOURCES} ${PA_PLATFORM_SOURCES}) @@ -142,9 +142,9 @@ IF(WIN32) FIND_PACKAGE(ASIOSDK) IF(ASIOSDK_FOUND) OPTION(PA_USE_ASIO "Enable support for ASIO" ON) - ELSE(ASIOSDK_FOUND) + ELSE() OPTION(PA_USE_ASIO "Enable support for ASIO" OFF) - ENDIF(ASIOSDK_FOUND) + ENDIF() IF(PA_USE_ASIO) SET(PA_PRIVATE_INCLUDE_PATHS ${PA_PRIVATE_INCLUDE_PATHS} ${ASIOSDK_ROOT_DIR}/common) SET(PA_PRIVATE_INCLUDE_PATHS ${PA_PRIVATE_INCLUDE_PATHS} ${ASIOSDK_ROOT_DIR}/host) @@ -160,21 +160,21 @@ IF(WIN32) ELSE() # Set variables for DEF file expansion SET(DEF_EXCLUDE_ASIO_SYMBOLS ";") - ENDIF(PA_USE_ASIO) + ENDIF() # Try to find DirectX SDK FIND_PACKAGE(DXSDK) IF(DXSDK_FOUND) OPTION(PA_USE_DS "Enable support for DirectSound" ON) - ELSE(DXSDK_FOUND) + ELSE() OPTION(PA_USE_DS "Enable support for DirectSound" OFF) - ENDIF(DXSDK_FOUND) + ENDIF() IF(PA_USE_DS) OPTION(PA_USE_DIRECTSOUNDFULLDUPLEXCREATE "Use DirectSound full duplex create" ON) MARK_AS_ADVANCED(PA_USE_DIRECTSOUNDFULLDUPLEXCREATE) IF(PA_USE_DIRECTSOUNDFULLDUPLEXCREATE) SET(PA_PRIVATE_COMPILE_DEFINITIONS ${PA_PRIVATE_COMPILE_DEFINITIONS} PAWIN_USE_DIRECTSOUNDFULLDUPLEXCREATE) - ENDIF(PA_USE_DIRECTSOUNDFULLDUPLEXCREATE) + ENDIF() SET(PA_PRIVATE_INCLUDE_PATHS ${PA_PRIVATE_INCLUDE_PATHS} ${DXSDK_INCLUDE_DIR}) SET(PA_DS_INCLUDES src/hostapi/dsound/pa_win_ds_dynlink.h) SET(PA_DS_SOURCES src/hostapi/dsound/pa_win_ds.c src/hostapi/dsound/pa_win_ds_dynlink.c) @@ -186,8 +186,8 @@ IF(WIN32) # If we use DirectSound, we need this for the library to be found (if not in VS project settings) IF(DXSDK_FOUND) SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} ${DXSDK_DSOUND_LIBRARY}) - ENDIF(DXSDK_FOUND) - ENDIF(PA_USE_DS) + ENDIF() + ENDIF() OPTION(PA_USE_WMME "Enable support for MME" ON) IF(PA_USE_WMME) @@ -195,7 +195,7 @@ IF(WIN32) SOURCE_GROUP("hostapi\\wmme" FILES ${PA_WMME_SOURCES}) SET(PA_PUBLIC_INCLUDES ${PA_PUBLIC_INCLUDES} include/pa_win_wmme.h) SET(PA_SOURCES ${PA_SOURCES} ${PA_WMME_SOURCES}) - ENDIF(PA_USE_WMME) + ENDIF() IF(MSVS) OPTION(PA_USE_WASAPI "Enable support for WASAPI" ON) @@ -214,7 +214,7 @@ IF(WIN32) ENDIF() ELSE() SET(DEF_EXCLUDE_WASAPI_SYMBOLS ";") - ENDIF(PA_USE_WASAPI) + ENDIF() OPTION(PA_USE_WDMKS "Enable support for WDMKS" ON) IF(PA_USE_WDMKS) @@ -224,13 +224,13 @@ IF(WIN32) SET(PA_SOURCES ${PA_SOURCES} ${PA_WDMKS_SOURCES}) # If we use WDM/KS we need setupapi.lib SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} setupapi) - ENDIF(PA_USE_WDMKS) + ENDIF() OPTION(PA_USE_WDMKS_DEVICE_INFO "Use WDM/KS API for device info" ON) MARK_AS_ADVANCED(PA_USE_WDMKS_DEVICE_INFO) IF(PA_USE_WDMKS_DEVICE_INFO) SET(PA_PRIVATE_COMPILE_DEFINITIONS ${PA_PRIVATE_COMPILE_DEFINITIONS} PAWIN_USE_WDMKS_DEVICE_INFO) - ENDIF(PA_USE_WDMKS_DEVICE_INFO) + ENDIF() SET(GENERATED_MESSAGE "CMake generated file, do NOT edit! Use CMake-GUI to change configuration instead.") CONFIGURE_FILE(cmake_support/template_portaudio.def ${CMAKE_CURRENT_BINARY_DIR}/portaudio_cmake.def @ONLY) @@ -280,9 +280,9 @@ ELSE() FIND_PACKAGE(Jack) IF(JACK_FOUND) OPTION(PA_USE_JACK "Enable support for Jack" ON) - ELSE(JACK_FOUND) + ELSE() OPTION(PA_USE_JACK "Enable support for Jack" OFF) - ENDIF(JACK_FOUND) + ENDIF() IF(PA_USE_JACK) SET(PA_PRIVATE_INCLUDE_PATHS ${PA_PRIVATE_INCLUDE_PATHS} ${JACK_INCLUDE_DIRS}) SET(PA_JACK_SOURCES src/hostapi/jack/pa_jack.c) @@ -292,14 +292,14 @@ ELSE() SET(PA_PRIVATE_COMPILE_DEFINITIONS ${PA_PRIVATE_COMPILE_DEFINITIONS} PA_USE_JACK) SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} ${JACK_LIBRARIES}) SET(PA_PKGCONFIG_LDFLAGS "${PA_PKGCONFIG_LDFLAGS} -ljack") - ENDIF(PA_USE_JACK) + ENDIF() FIND_PACKAGE(ALSA) IF(ALSA_FOUND) OPTION(PA_USE_ALSA "Enable support for ALSA" ON) - ELSE(ALSA_FOUND) + ELSE() OPTION(PA_USE_ALSA "Enable support for ALSA" OFF) - ENDIF(ALSA_FOUND) + ENDIF() IF(PA_USE_ALSA) SET(PA_PRIVATE_INCLUDE_PATHS ${PA_PRIVATE_INCLUDE_PATHS} ${ALSA_INCLUDE_DIRS}) SET(PA_ALSA_SOURCES src/hostapi/alsa/pa_linux_alsa.c) @@ -309,14 +309,14 @@ ELSE() SET(PA_PRIVATE_COMPILE_DEFINITIONS ${PA_PRIVATE_COMPILE_DEFINITIONS} PA_USE_ALSA) SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} ${ALSA_LIBRARIES}) SET(PA_PKGCONFIG_LDFLAGS "${PA_PKGCONFIG_LDFLAGS} -lasound") - ENDIF(PA_USE_ALSA) + ENDIF() ENDIF() SET(PA_PKGCONFIG_LDFLAGS "${PA_PKGCONFIG_LDFLAGS} -lm -lpthread") SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} m pthread) -ENDIF(WIN32) +ENDIF() SOURCE_GROUP("include" FILES ${PA_PUBLIC_INCLUDES}) @@ -326,7 +326,7 @@ IF(WIN32) OPTION(PA_UNICODE_BUILD "Enable Portaudio Unicode build" ON) IF(PA_UNICODE_BUILD) SET_SOURCE_FILES_PROPERTIES(${PA_SOURCES} PROPERTIES COMPILE_DEFINITIONS "UNICODE;_UNICODE") - ENDIF(PA_UNICODE_BUILD) + ENDIF() ENDIF() OPTION(PA_ENABLE_DEBUG_OUTPUT "Enable debug output for Portaudio" OFF) @@ -360,13 +360,13 @@ IF(WIN32 AND MSVC) SET(TARGET_POSTFIX x64) IF(PA_CONFIG_LIB_OUTPUT_PATH) SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/bin/x64) - ENDIF(PA_CONFIG_LIB_OUTPUT_PATH) - ELSE(CMAKE_CL_64) + ENDIF() + ELSE() SET(TARGET_POSTFIX x86) IF(PA_CONFIG_LIB_OUTPUT_PATH) SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/bin/Win32) - ENDIF(PA_CONFIG_LIB_OUTPUT_PATH) - ENDIF(CMAKE_CL_64) + ENDIF() + ENDIF() SET_TARGET_PROPERTIES(portaudio PROPERTIES OUTPUT_NAME portaudio_${TARGET_POSTFIX} FOLDER "Portaudio") SET_TARGET_PROPERTIES(portaudio_static PROPERTIES OUTPUT_NAME portaudio_static_${TARGET_POSTFIX} FOLDER "Portaudio") ELSE() @@ -380,7 +380,7 @@ ELSE() PUBLIC_HEADER "${PA_PUBLIC_INCLUDES}" VERSION 19.0 SOVERSION 19.0) - ENDIF(PA_OUTPUT_OSX_FRAMEWORK) + ENDIF() ENDIF() IF(NOT PA_OUTPUT_OSX_FRAMEWORK) @@ -388,18 +388,18 @@ ELSE() INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/portaudio-2.0.pc DESTINATION lib/pkgconfig) INSTALL(FILES ${PA_PUBLIC_INCLUDES} DESTINATION include) INSTALL(TARGETS portaudio DESTINATION lib) - ENDIF(NOT PA_OUTPUT_OSX_FRAMEWORK) + ENDIF() ENDIF() # Prepared for inclusion of test files OPTION(PA_BUILD_TESTS "Include test projects" OFF) IF(PA_BUILD_TESTS) SUBDIRS(test) -ENDIF(PA_BUILD_TESTS) +ENDIF() # Prepared for inclusion of test files OPTION(PA_BUILD_EXAMPLES "Include example projects" OFF) IF(PA_BUILD_EXAMPLES) SUBDIRS(examples) -ENDIF(PA_BUILD_EXAMPLES) +ENDIF() diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 0395d68..f96b6ec 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -20,7 +20,9 @@ ENDMACRO(ADD_EXAMPLE_CPP) ADD_EXAMPLE(pa_devs) ADD_EXAMPLE(pa_fuzz) -ADD_EXAMPLE(paex_mono_asio_channel_select) +IF(PA_USE_ASIO AND WIN32) + ADD_EXAMPLE(paex_mono_asio_channel_select) +ENDIF() ADD_EXAMPLE(paex_ocean_shore) TARGET_INCLUDE_DIRECTORIES(paex_ocean_shore PRIVATE ../src/common) ADD_EXAMPLE(paex_pink) @@ -31,7 +33,9 @@ TARGET_INCLUDE_DIRECTORIES(paex_record_file PRIVATE ../src/common) ADD_EXAMPLE(paex_saw) ADD_EXAMPLE(paex_sine) ADD_EXAMPLE_CPP(paex_sine_c++) -ADD_EXAMPLE(paex_wmme_ac3) -ADD_EXAMPLE(paex_wmme_surround) +IF(PA_USE_WMME AND WIN32) + ADD_EXAMPLE(paex_wmme_ac3) + ADD_EXAMPLE(paex_wmme_surround) +ENDIF() ADD_EXAMPLE(paex_write_sine) ADD_EXAMPLE(paex_write_sine_nonint) diff --git a/examples/paex_record_file.c b/examples/paex_record_file.c index edde5ab..1f1211f 100644 --- a/examples/paex_record_file.c +++ b/examples/paex_record_file.c @@ -52,6 +52,11 @@ #include #endif +static ring_buffer_size_t rbs_min(ring_buffer_size_t a, ring_buffer_size_t b) +{ + return (a < b) ? a : b; +} + /* #define SAMPLE_RATE (17932) // Test failure to open with this value. */ #define FILE_NAME "audio_data.raw" #define SAMPLE_RATE (44100) @@ -243,7 +248,7 @@ static int recordCallback( const void *inputBuffer, void *outputBuffer, { paTestData *data = (paTestData*)userData; ring_buffer_size_t elementsWriteable = PaUtil_GetRingBufferWriteAvailable(&data->ringBuffer); - ring_buffer_size_t elementsToWrite = min(elementsWriteable, (ring_buffer_size_t)(framesPerBuffer * NUM_CHANNELS)); + ring_buffer_size_t elementsToWrite = rbs_min(elementsWriteable, (ring_buffer_size_t)(framesPerBuffer * NUM_CHANNELS)); const SAMPLE *rptr = (const SAMPLE*)inputBuffer; (void) outputBuffer; /* Prevent unused variable warnings. */ @@ -268,7 +273,7 @@ static int playCallback( const void *inputBuffer, void *outputBuffer, { paTestData *data = (paTestData*)userData; ring_buffer_size_t elementsToPlay = PaUtil_GetRingBufferReadAvailable(&data->ringBuffer); - ring_buffer_size_t elementsToRead = min(elementsToPlay, (ring_buffer_size_t)(framesPerBuffer * NUM_CHANNELS)); + ring_buffer_size_t elementsToRead = rbs_min(elementsToPlay, (ring_buffer_size_t)(framesPerBuffer * NUM_CHANNELS)); SAMPLE* wptr = (SAMPLE*)outputBuffer; (void) inputBuffer; /* Prevent unused variable warnings. */