Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-15 15:49:36 +02:00
Code Issues Releases Wiki Activity

allow building with upstream PortAudio

Browse Source 
* AudioIOBase: add missing #include <portaudio.h>

This is required for building with system PortAudio library.

* CMake: allow building with system PortAudio
* CMake: fatal error if use_portaudio=system and use_portmixer=local

Signed-off-by: Be <be@mixxx.org>
This commit is contained in:
Be 2021-07-12 06:18:53 -05:00 committed by GitHub
parent 245016e215
commit 395c4a584e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake-proxies/CMakeLists.txt
View File

@ -140,7 +140,7 @@ set_conan_vars_to_parent()
# directory option symbol req chk version
addlib( libsndfile sndfile SNDFILE YES YES "sndfile >= 1.0.28" )
addlib( libsoxr soxr SOXR YES YES "soxr >= 0.1.1" )
addlib( portaudio-v19 portaudio PORTAUDIO YES YES "" )
addlib( portaudio-v19 portaudio PORTAUDIO YES YES "portaudio-2.0 >= 19" )
addlib( sqlite sqlite SQLITE YES YES "sqlite3 >= 3.32.0" )
# Optional libraries
@ -162,6 +162,11 @@ endif ()
addlib( portmixer portmixer PORTMIXER NO YES "" )
if (USE_PORTMIXER AND use_portaudio STREQUAL "system")
message(FATAL_ERROR "Tenacity's use of PortMixer requires using the vendored fork of PortAudio.\n"
"${_OPT}use_portaudio=local is required if ${_OPT}use_portmixer=local\n"
"Alternatively set ${_OPT}use_portmixer=off to keep ${_OPT}use_portaudio=system")
endif()
if (NOT USE_PORTMIXER AND
"EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT" IN_LIST
EXPERIMENTAL_OPTIONS_LIST )

2
src/AudioIOBase.h
View File

@ -21,6 +21,8 @@ Paul Licameli split from AudioIO.h
#include <wx/weakref.h> // member variable
#include "MemoryX.h"
#include <portaudio.h>
struct PaDeviceInfo;
typedef void PaStream;