From 7b8fc307dc4ff608fc68e2decee45bae59f0c7c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20M=C3=BCller?= Date: Tue, 16 Mar 2021 22:32:16 +0100 Subject: Audaspace: porting minor improvements from upstream - NullDevice is now called None - Automatic choice of best available device. - Minor formatting, documentation and cmake fixes. --- extern/audaspace/CMakeLists.txt | 10 +++++----- extern/audaspace/bindings/C/AUD_Special.cpp | 2 +- extern/audaspace/plugins/jack/JackLibrary.h | 3 +-- extern/audaspace/src/devices/NULLDevice.cpp | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) (limited to 'extern/audaspace') diff --git a/extern/audaspace/CMakeLists.txt b/extern/audaspace/CMakeLists.txt index 84f5e8441c1..996d4b27911 100644 --- a/extern/audaspace/CMakeLists.txt +++ b/extern/audaspace/CMakeLists.txt @@ -380,16 +380,16 @@ if(WITH_C) bindings/C/AUD_Types.h ) -if(WITH_FFTW) - list(APPEND C_SRC + if(WITH_FFTW) + list(APPEND C_SRC bindings/C/AUD_HRTF.cpp bindings/C/AUD_ImpulseResponse.cpp - ) + ) list(APPEND C_HDR bindings/C/AUD_HRTF.h bindings/C/AUD_ImpulseResponse.h - ) + ) endif() if(NOT SEPARATE_C) @@ -504,7 +504,7 @@ if(WITH_JACK) plugins/jack/JackSymbols.h ) - if(DYNLOAD_JACK) + if(DYNLOAD_JACK) add_definitions(-DDYNLOAD_JACK) endif() diff --git a/extern/audaspace/bindings/C/AUD_Special.cpp b/extern/audaspace/bindings/C/AUD_Special.cpp index a83465620ab..ac876a01eb3 100644 --- a/extern/audaspace/bindings/C/AUD_Special.cpp +++ b/extern/audaspace/bindings/C/AUD_Special.cpp @@ -376,7 +376,7 @@ AUD_API AUD_Device* AUD_init(const char* device, AUD_DeviceSpecs specs, int buff { try { - std::shared_ptr factory = DeviceManager::getDeviceFactory(device); + std::shared_ptr factory = device ? DeviceManager::getDeviceFactory(device) : DeviceManager::getDefaultDeviceFactory(); if(factory) { diff --git a/extern/audaspace/plugins/jack/JackLibrary.h b/extern/audaspace/plugins/jack/JackLibrary.h index 4e210852702..533eca7272a 100644 --- a/extern/audaspace/plugins/jack/JackLibrary.h +++ b/extern/audaspace/plugins/jack/JackLibrary.h @@ -21,9 +21,8 @@ #endif /** - * @file JackDevice.h + * @file JackLibrary.h * @ingroup plugin - * The JackDevice class. */ #include "Audaspace.h" diff --git a/extern/audaspace/src/devices/NULLDevice.cpp b/extern/audaspace/src/devices/NULLDevice.cpp index c3290465563..fa8e457dbd2 100644 --- a/extern/audaspace/src/devices/NULLDevice.cpp +++ b/extern/audaspace/src/devices/NULLDevice.cpp @@ -187,7 +187,7 @@ public: void NULLDevice::registerPlugin() { - DeviceManager::registerDevice("Null", std::shared_ptr(new NULLDeviceFactory)); + DeviceManager::registerDevice("None", std::shared_ptr(new NULLDeviceFactory)); } AUD_NAMESPACE_END -- cgit v1.2.3