From e5fa5a515cd7ae3e7012e8462928a895df122b3a Mon Sep 17 00:00:00 2001 From: Klemens Nanni Date: Wed, 15 Dec 2021 18:00:20 +0100 Subject: [PATCH] audio: Build on OpenBSD OpenBSD supports PulseAudio and OpenAL, but not ALSA. Either PulseAudio or ALSA are required for libtgvoip. Add missing OS macros to enable building with `LIBTGVOIP_DISABLE_PULSEAUDIO=ON` `LIBTGVOIP_DISABLE_ALSA=OFF` as tested on OpenBSD/amd64 7.2-current. --- VoIPController.cpp | 2 +- audio/AudioIO.cpp | 4 ++-- audio/AudioInput.cpp | 4 ++-- audio/AudioOutput.cpp | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/VoIPController.cpp b/VoIPController.cpp index aa82592..0c0e23b 100644 --- a/VoIPController.cpp +++ b/VoIPController.cpp @@ -3014,7 +3014,7 @@ static void initMachTimestart() { #endif double VoIPController::GetCurrentTime(){ -#if defined(__linux__) || defined(__FreeBSD__) +#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); return ts.tv_sec+(double)ts.tv_nsec/1000000000.0; diff --git a/audio/AudioIO.cpp b/audio/AudioIO.cpp index 29d5ad9..8095646 100644 --- a/audio/AudioIO.cpp +++ b/audio/AudioIO.cpp @@ -31,7 +31,7 @@ #endif #include "../os/windows/AudioInputWASAPI.h" #include "../os/windows/AudioOutputWASAPI.h" -#elif defined(__linux__) || defined(__FreeBSD__) || defined(__gnu_hurd__) +#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__gnu_hurd__) #ifndef WITHOUT_ALSA #include "../os/linux/AudioInputALSA.h" #include "../os/linux/AudioOutputALSA.h" @@ -65,7 +65,7 @@ AudioIO* AudioIO::Create(std::string inputDevice, std::string outputDevice){ return new ContextlessAudioIO(inputDevice, outputDevice); #endif return new ContextlessAudioIO(inputDevice, outputDevice); -#elif defined(__linux__) || defined(__FreeBSD__) +#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) #ifndef WITHOUT_ALSA #ifndef WITHOUT_PULSE if(AudioPulse::Load()){ diff --git a/audio/AudioInput.cpp b/audio/AudioInput.cpp index efdc535..1527497 100644 --- a/audio/AudioInput.cpp +++ b/audio/AudioInput.cpp @@ -26,7 +26,7 @@ #include "../os/windows/AudioInputWave.h" #endif #include "../os/windows/AudioInputWASAPI.h" -#elif defined(__linux__) || defined(__FreeBSD__) || defined(__gnu_hurd__) +#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__gnu_hurd__) #ifndef WITHOUT_ALSA #include "../os/linux/AudioInputALSA.h" #endif @@ -72,7 +72,7 @@ void AudioInput::EnumerateDevices(std::vector& devs){ } #endif AudioInputWASAPI::EnumerateDevices(devs); -#elif (defined(__linux__) && !defined(__ANDROID__)) || defined(__FreeBSD__) +#elif (defined(__linux__) && !defined(__ANDROID__)) || defined(__FreeBSD__) || defined(__OpenBSD__) #if !defined(WITHOUT_PULSE) && !defined(WITHOUT_ALSA) if(!AudioInputPulse::EnumerateDevices(devs)) AudioInputALSA::EnumerateDevices(devs); diff --git a/audio/AudioOutput.cpp b/audio/AudioOutput.cpp index 3f88799..d42bd4d 100644 --- a/audio/AudioOutput.cpp +++ b/audio/AudioOutput.cpp @@ -29,7 +29,7 @@ #include "../os/windows/AudioOutputWave.h" #endif #include "../os/windows/AudioOutputWASAPI.h" -#elif defined(__linux__) || defined(__FreeBSD__) || defined(__gnu_hurd__) +#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__gnu_hurd__) #ifndef WITHOUT_ALSA #include "../os/linux/AudioOutputALSA.h" #endif @@ -83,7 +83,7 @@ void AudioOutput::EnumerateDevices(std::vector& devs){ } #endif AudioOutputWASAPI::EnumerateDevices(devs); -#elif (defined(__linux__) && !defined(__ANDROID__)) || defined(__FreeBSD__) +#elif (defined(__linux__) && !defined(__ANDROID__)) || defined(__FreeBSD__) || defined(__OpenBSD__) #if !defined(WITHOUT_PULSE) && !defined(WITHOUT_ALSA) if(!AudioOutputPulse::EnumerateDevices(devs)) AudioOutputALSA::EnumerateDevices(devs);