Squash test

.gitignore

@@ -19,6 +19,10 @@ libtool
 portaudio-2.0.pc
 autom4te.cache/*
 
+# build_all_PaOboe.sh CMake output folder
+build
+build_old
+
 # Precompiled Headers
 *.gch
 *.pch
@@ -54,5 +58,7 @@ CMakeSettings.json
 # VSCode
 .vscode*
 
+# idea
+.idea*
+
 # Common build directories of users and VSCode
-build*

Makefile.in

@@ -44,7 +44,7 @@ PALIB = libportaudio.la
 PAINC = include/portaudio.h
 
 PA_LDFLAGS = $(LDFLAGS) $(SHARED_FLAGS) -rpath $(libdir) -no-undefined \
-	     -export-symbols-regex "(Pa|PaMacCore|PaJack|PaAlsa|PaAsio|PaOSS|PaWasapi|PaWasapiWinrt|PaWinMME)_.*" \
+	     -export-symbols-regex "(Pa|PaMacCore|PaPulseAudio|PaJack|PaAlsa|PaAsio|PaOSS|PaWasapi|PaWasapiWinrt|PaWinMME)_.*" \
 	     -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 COMMON_OBJS = \
@@ -66,7 +66,7 @@ LOOPBACK_OBJS = \
 	qa/loopback/src/test_audio_analyzer.o \
 	qa/loopback/src/write_wav.o \
 	qa/loopback/src/paqa.o
-	
+
 EXAMPLES = \
 	bin/pa_devs \
 	bin/pa_fuzz \
@@ -82,7 +82,7 @@ SELFTESTS = \
 	bin/paqa_devs \
 	bin/paqa_errs \
 	bin/paqa_latency
-	
+
 TESTS = \
 	bin/patest1 \
 	bin/patest_buffer \
@@ -146,6 +146,7 @@ SRC_DIRS = \
 	src/hostapi/coreaudio \
 	src/hostapi/dsound \
 	src/hostapi/jack \
+	src/hostapi/pulseaudio \
 	src/hostapi/oss \
 	src/hostapi/skeleton \
 	src/hostapi/wasapi \

README.md

@@ -30,7 +30,6 @@ Please feel free to join. See http://www.portaudio.com for details.
     src/os                  = os specific (but host api neutral) code
     src/hostapi             = implementations for different host apis
 
-
 ### Host API Implementations:
 
     src/hostapi/alsa        = Advanced Linux Sound Architecture (ALSA)
@@ -40,7 +39,9 @@ Please feel free to join. See http://www.portaudio.com for details.
     src/hostapi/coreaudio   = Macintosh Core Audio for OS X
     src/hostapi/dsound      = Windows Direct Sound
     src/hostapi/jack        = JACK Audio Connection Kit
+    src/hostapi/oboe        = Oboe Library for Android (see src/hostapi/oboe/README.md)
     src/hostapi/oss         = Unix Open Sound System (OSS)
+    src/hostapi/pulseaudio  = Sound system for POSIX OSes
     src/hostapi/wasapi      = Windows Vista WASAPI
     src/hostapi/wdmks       = Windows WDM Kernel Streaming
     src/hostapi/wmme        = Windows MultiMedia Extensions (MME)

bindings/cpp/CMakeLists.txt

@@ -118,5 +118,5 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PortAudioCppConfig.cmake"
 set(PC_PREFIX "\${pcfiledir}/../..")  
 configure_file(cmake/portaudiocpp.pc.in "${CMAKE_CURRENT_BINARY_DIR}/portaudiocpp.pc" @ONLY)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/portaudiocpp.pc"
-        CONFIGURATIONS Release
+        CONFIGURATIONS Release RelWithDebInfo
         DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

build_all_PaOboe.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+# Script used to build Portaudio for multiple Android ABIs, useful for its Oboe host API.
+#
+# Ensure that ANDROID_NDK environment variable is set to your Android NDK location
+# e.g. /Library/Android/sdk/ndk-bundle
+
+if [ -z "$ANDROID_NDK" ]; then
+  echo "Please set ANDROID_NDK to the Android NDK folder"
+  exit 1
+fi
+
+# Build directory
+BUILD_DIR=build
+
+CMAKE_ARGS="-H. \
+  -DBUILD_SHARED_LIBS=true \
+  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+  -DANDROID_TOOLCHAIN=clang \
+  -DANDROID_STL=c++_shared \
+  -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake \
+  -DCMAKE_INSTALL_PREFIX=."
+
+function build_PaOboe {
+
+  ABI=$1
+  MINIMUM_API_LEVEL=$2
+  ABI_BUILD_DIR=${BUILD_DIR}/${ABI}
+
+  echo "Building Pa_Oboe for ${ABI}"
+
+  mkdir -p ${ABI_BUILD_DIR} ${ABI_BUILD_DIR}/${STAGING_DIR}
+
+  cmake -B${ABI_BUILD_DIR} \
+        -DANDROID_ABI=${ABI} \
+        -DANDROID_PLATFORM=android-${MINIMUM_API_LEVEL}\
+        ${CMAKE_ARGS}
+
+  pushd ${ABI_BUILD_DIR}
+  make -j5
+  popd
+}
+
+#build_PaOboe armeabi-v7a 16
+build_PaOboe arm64-v8a 21
+#build_PaOboe x86 16
+build_PaOboe x86_64 21

cmake/modules/FindOboe.cmake

@@ -0,0 +1,74 @@
+#[=======================================================================[.rst:
+Findoboe
+--------
+
+Finds the oboe library. OBOE_DIRECTORY has to be set to the path of the directory where
+the oboe repository was cloned (see src/hostapi/oboe/README.md for more information).
+
+Imported Targets
+^^^^^^^^^^^^^^^^
+
+This module provides the following imported target, if found:
+
+``Oboe::oboe``
+  The OBOE library
+
+#]=======================================================================]
+
+if(NOT DEFINED OBOE_DIRECTORY)
+    #Insert the path of the directory where you cloned Oboe, i.e. ${CMAKE_CURRENT_SOURCE_DIR}/../oboe
+    set(OBOE_DIRECTORY FALSE)
+endif()
+
+if(NOT OBOE_DIRECTORY)
+    message(AUTHOR_WARNING
+            "If you're trying to use Oboe as a Host API, please specify the directory where you "
+            "cloned its repository. For further information, please read src/hostapi/oboe/README.md"
+            )
+    set(OBOE_FOUND FALSE)
+else()
+    if(NOT DEFINED OBOE_INCLUDE_DIR)
+        set(OBOE_INCLUDE_DIR ${OBOE_DIRECTORY}/include)
+    endif()
+
+    if(NOT DEFINED OBOE_LIBRARY_DIRS)
+        set(OBOE_LIBRARY_DIRS ${OBOE_DIRECTORY}/build/${ANDROID_ABI})
+    endif()
+    set(OBOE_LIBRARIES ${OBOE_LIBRARY_DIRS}/liboboe.so)
+
+    find_package(PkgConfig QUIET)
+    if(PkgConfig_FOUND)
+        pkg_check_modules(OBOE Oboe)
+    else()
+        find_library(OBOE_LIBRARIES
+                NAMES liboboe.so
+                HINTS ${OBOE_LIBRARY_DIRS}
+                DOC "Oboe Library"
+                )
+        find_path(OBOE_INCLUDE_DIR
+                NAMES oboe/Oboe.h
+                DOC "Oboe header"
+                )
+    endif()
+
+    find_library(LOG_LIBRARY log) #used by pa_oboe.cpp and pa_oboe.h as a logging tool
+
+    set(OBOE_LINK_LIBRARIES ${OBOE_LIBRARIES} ${LOG_LIBRARY})
+
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(
+            Oboe
+            DEFAULT_MSG
+            OBOE_LINK_LIBRARIES
+            OBOE_INCLUDE_DIR
+    )
+
+    if(OBOE_INCLUDE_DIR AND OBOE_LINK_LIBRARIES)
+        set(OBOE_FOUND TRUE)
+        if(NOT TARGET Oboe::oboe)
+            add_library(Oboe::oboe INTERFACE IMPORTED GLOBAL)
+            target_link_libraries(Oboe::oboe INTERFACE "${OBOE_LINK_LIBRARIES}")
+            target_include_directories(Oboe::oboe INTERFACE "${OBOE_INCLUDE_DIR}")
+        endif()
+    endif()
+endif()

cmake/modules/FindPulseAudio.cmake

@@ -0,0 +1,147 @@
+# Copyright  2008 Matthias Kretz <kretz@kde.org>
+# Copyright 2009 Marcus Hufgard <Marcus.Hufgard@hufgard.de>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+#    contributors may be used to endorse or promote products derived from
+#    this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# SPDX-FileCopyrightText: 2008 Matthias Kretz <kretz@kde.org>
+# SPDX-FileCopyrightText: 2009 Marcus Hufgard <Marcus.Hufgard@hufgard.de>
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
+#.rst:
+# FindPulseAudio
+# --------------
+#
+# This is base on
+# https://invent.kde.org/frameworks/extra-cmake-modules/-/blob/master/find-modules/FindPulseAudio.cmake
+#
+# Try to locate the PulseAudio library.
+# If found, this will define the following variables:
+#
+# ``PulseAudio_FOUND``
+#      True if the system has the PulseAudio library of at least
+#      the minimum version specified by either the version parameter
+#      to find_package() or the variable PulseAudio_MINIMUM_VERSION
+# ``PulseAudio_INCLUDE_DIRS``
+#      The PulseAudio include directory
+# ``PulseAudio_LIBRARIES``
+#      The PulseAudio libraries for linking
+# ``PulseAudio_MAINLOOP_LIBRARY``
+#      The libraries needed to use PulseAudio Mainloop
+# ``PulseAudio_VERSION``
+#      The version of PulseAudio that was found
+# ``PulseAudio_INCLUDE_DIR``
+#     Deprecated, use ``PulseAudio_INCLUDE_DIRS``
+# ``PulseAudio_LIBRARY``
+#     Deprecated, use ``PulseAudio_LIBRARIES``
+#
+# If ``PulseAudio_FOUND`` is TRUE, it will also define the following
+# imported target:
+#
+# ``PulseAudio::PulseAudio``
+#     The PulseAudio library
+#
+# Since 5.41.0.
+
+# Support PulseAudio_MINIMUM_VERSION for compatibility:
+if(NOT PulseAudio_FIND_VERSION)
+  set(PulseAudio_FIND_VERSION "${PulseAudio_MINIMUM_VERSION}")
+endif()
+
+# the minimum version of PulseAudio we require
+if(NOT PulseAudio_FIND_VERSION)
+  set(PulseAudio_FIND_VERSION "1.0.0")
+endif()
+
+find_package(PkgConfig)
+pkg_check_modules(PC_PulseAudio QUIET libpulse>=${PulseAudio_FIND_VERSION})
+pkg_check_modules(PC_PulseAudio_MAINLOOP QUIET libpulse-mainloop-glib)
+
+find_path(PulseAudio_INCLUDE_DIRS pulse/pulseaudio.h
+  HINTS
+  ${PC_PulseAudio_INCLUDEDIR}
+  ${PC_PulseAudio_INCLUDE_DIRS}
+  )
+
+find_library(PulseAudio_LIBRARIES NAMES pulse libpulse
+  HINTS
+  ${PC_PulseAudio_LIBDIR}
+  ${PC_PulseAudio_LIBRARY_DIRS}
+  )
+
+find_library(PulseAudio_MAINLOOP_LIBRARY
+  NAMES pulse-mainloop pulse-mainloop-glib libpulse-mainloop-glib
+  HINTS
+  ${PC_PulseAudio_LIBDIR}
+  ${PC_PulseAudio_LIBRARY_DIRS}
+  )
+
+# Store the version number in the cache,
+# so we don't have to search every time again:
+if(PulseAudio_INCLUDE_DIRS AND NOT PulseAudio_VERSION)
+
+  # get PulseAudio's version from its version.h
+  file(STRINGS "${PulseAudio_INCLUDE_DIRS}/pulse/version.h" pulse_version_h
+    REGEX ".*pa_get_headers_version\\(\\).*")
+  string(REGEX REPLACE ".*pa_get_headers_version\\(\\)\ \\(\"([0-9]+\\.[0-9]+\\.[0-9]+)[^\"]*\"\\).*" "\\1"
+    _PulseAudio_VERSION "${pulse_version_h}")
+
+  set(PulseAudio_VERSION "${_PulseAudio_VERSION}"
+    CACHE STRING "Version number of PulseAudio"
+    FORCE)
+endif()
+
+# Use the new extended syntax of
+# find_package_handle_standard_args(),
+# which also handles version checking:
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(PulseAudio
+  REQUIRED_VARS PulseAudio_LIBRARIES
+  PulseAudio_INCLUDE_DIRS
+  VERSION_VAR PulseAudio_VERSION)
+
+# Deprecated synonyms
+set(PulseAudio_INCLUDE_DIR "${PulseAudio_INCLUDE_DIRS}")
+set(PulseAudio_LIBRARY "${PulseAudio_LIBRARIES}")
+set(PulseAudio_MAINLOOP_LIBRARY "${PulseAudio_MAINLOOP_LIBRARY}")
+set(PulseAudio_FOUND "${PulseAudio_FOUND}")
+
+if(PulseAudio_FOUND AND NOT TARGET PulseAudio::PulseAudio)
+  add_library(PulseAudio::PulseAudio UNKNOWN IMPORTED)
+  set_target_properties(PulseAudio::PulseAudio PROPERTIES
+    IMPORTED_LOCATION "${PulseAudio_LIBRARIES}"
+    INTERFACE_INCLUDE_DIRECTORIES "${PulseAudio_INCLUDE_DIRS}")
+endif()
+
+mark_as_advanced(PulseAudio_INCLUDE_DIRS PulseAudio_INCLUDE_DIR
+  PulseAudio_LIBRARIES PulseAudio_LIBRARY
+  PulseAudio_MAINLOOP_LIBRARY PulseAudio_MAINLOOP_LIBRARY)
+
+include(FeatureSummary)
+set_package_properties(PulseAudio PROPERTIES
+  URL "https://www.freedesktop.org/wiki/Software/PulseAudio"
+  DESCRIPTION "Sound server, for sound stream routing and mixing")