From 806da09a120f254ae231c2ef87cf9fe2f4fb4f5b Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 3 Dec 2023 12:29:07 +0100 Subject: [PATCH] Allow portaudio driver on any system, use device reservation too Signed-off-by: falkTX --- windows/portaudio/JackPortAudioDriver.cpp | 86 ++++++++++++++++++++++- windows/portaudio/JackPortAudioDriver.h | 17 ++++- wscript | 1 - 3 files changed, 99 insertions(+), 5 deletions(-) diff --git a/windows/portaudio/JackPortAudioDriver.cpp b/windows/portaudio/JackPortAudioDriver.cpp index 97ceecd2..67829aba 100644 --- a/windows/portaudio/JackPortAudioDriver.cpp +++ b/windows/portaudio/JackPortAudioDriver.cpp @@ -29,11 +29,43 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include #include +#ifdef __linux__ +#include "JackServerGlobals.h" +#endif + using namespace std; namespace Jack { +#ifdef __linux__ +static volatile bool device_reservation_loop_running = false; + +static void* on_device_reservation_loop(void*) +{ + while (device_reservation_loop_running && JackServerGlobals::on_device_reservation_loop != NULL) { + JackServerGlobals::on_device_reservation_loop(); + usleep(50*1000); + } + + return NULL; +} + +static bool name_to_num(const char* paDeviceName, char* entry) +{ + if (const char* sep = strstr(paDeviceName, " (hw:")) + { + sep += 5; + while (*sep != '\0' && *sep != ',' && *sep != ')') + *entry++ = *sep++; + *entry = '\0'; + return true; + } + + return false; +} +#endif + int JackPortAudioDriver::Render(const void* inputBuffer, void* outputBuffer, unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo* timeInfo, @@ -231,6 +263,27 @@ int JackPortAudioDriver::Open(jack_nframes_t buffer_size, fCaptureChannels = inchannels; fPlaybackChannels = outchannels; +#ifdef __linux__ + if (JackServerGlobals::on_device_acquire != NULL) { + char audio_name[32]; + snprintf(audio_name, sizeof(audio_name), "Audio"); + + if (name_to_num(capture_driver_name, audio_name+5)) { + if (!JackServerGlobals::on_device_acquire(audio_name)) { + jack_error("Audio device %s cannot be acquired...", capture_driver_name); + return -1; + } + } + + if (strcmp(capture_driver_name, playback_driver_name) && name_to_num(playback_driver_name, audio_name+5)) { + if (!JackServerGlobals::on_device_acquire(audio_name)) { + jack_error("Audio device %s cannot be acquired...", playback_driver_name); + return -1; + } + } + } +#endif + err = OpenStream(buffer_size); if (err != paNoError) { jack_error("Pa_OpenStream error = %s", Pa_GetErrorText(err)); @@ -243,6 +296,15 @@ int JackPortAudioDriver::Open(jack_nframes_t buffer_size, fEngineControl->fConstraint = fEngineControl->fPeriodUsecs * 1000; #endif +#ifdef __linux__ + if (JackServerGlobals::on_device_reservation_loop != NULL) { + device_reservation_loop_running = true; + if (JackPosixThread::StartImp(&fReservationLoopThread, 0, 0, on_device_reservation_loop, NULL) != 0) { + device_reservation_loop_running = false; + } + } +#endif + return 0; error: @@ -260,6 +322,28 @@ int JackPortAudioDriver::Close() if (err != paNoError) { jack_error("Pa_CloseStream error = %s", Pa_GetErrorText(err)); } + +#ifdef __linux__ + if (device_reservation_loop_running) { + device_reservation_loop_running = false; + JackPosixThread::StopImp(fReservationLoopThread); + } + + if (JackServerGlobals::on_device_release != NULL) + { + char audio_name[32]; + snprintf(audio_name, sizeof(audio_name), "Audio"); + + if (name_to_num(fCaptureDriverName, audio_name+5)) { + JackServerGlobals::on_device_release(audio_name); + } + + if (strcmp(fCaptureDriverName, fPlaybackDriverName) && name_to_num(fPlaybackDriverName, audio_name+5)) { + JackServerGlobals::on_device_release(audio_name); + } + } +#endif + delete fPaDevices; fPaDevices = NULL; return (err != paNoError) ? -1 : 0; @@ -269,9 +353,9 @@ int JackPortAudioDriver::Attach() { if (JackAudioDriver::Attach() == 0) { +#if defined(HAVE_ASIO) const char* alias; -#if defined(HAVE_ASIO) if (fInputDevice != paNoDevice && fPaDevices->GetHostFromDevice(fInputDevice) == "ASIO") { for (int i = 0; i < fCaptureChannels; i++) { if (PaAsio_GetInputChannelName(fInputDevice, i, &alias) == paNoError) { diff --git a/windows/portaudio/JackPortAudioDriver.h b/windows/portaudio/JackPortAudioDriver.h index 9897f609..7b16d6ea 100644 --- a/windows/portaudio/JackPortAudioDriver.h +++ b/windows/portaudio/JackPortAudioDriver.h @@ -22,7 +22,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include "JackAudioDriver.h" #include "JackPortAudioDevices.h" + +#ifdef _WIN32 #include "JackMMCSS.h" +#endif namespace Jack { @@ -31,7 +34,11 @@ namespace Jack \brief The PortAudio driver. */ -class JackPortAudioDriver : public JackMMCSS, public JackAudioDriver +class JackPortAudioDriver : +#ifdef _WIN32 + public JackMMCSS, +#endif + public JackAudioDriver { private: @@ -42,6 +49,7 @@ class JackPortAudioDriver : public JackMMCSS, public JackAudioDriver PaDeviceIndex fInputDevice; PaDeviceIndex fOutputDevice; PortAudioDevices* fPaDevices; + jack_native_thread_t fReservationLoopThread; static int Render(const void* inputBuffer, void* outputBuffer, unsigned long framesPerBuffer, @@ -55,8 +63,11 @@ class JackPortAudioDriver : public JackMMCSS, public JackAudioDriver public: - JackPortAudioDriver(const char* name, const char* alias, JackLockedEngine* engine, JackSynchro* table, PortAudioDevices* pa_devices) - : JackMMCSS(), JackAudioDriver(name, alias, engine, table), fStream(NULL), fInputBuffer(NULL), fOutputBuffer(NULL), + JackPortAudioDriver(const char* name, const char* alias, JackLockedEngine* engine, JackSynchro* table, PortAudioDevices* pa_devices) : +#ifdef _WIN32 + JackMMCSS(), +#endif + JackAudioDriver(name, alias, engine, table), fStream(NULL), fInputBuffer(NULL), fOutputBuffer(NULL), fInputDevice(paNoDevice), fOutputDevice(paNoDevice), fPaDevices(pa_devices) {} diff --git a/wscript b/wscript index a669fa70..f0a09c87 100644 --- a/wscript +++ b/wscript @@ -151,7 +151,6 @@ def options(opt): 'portaudio', help='Enable Portaudio driver', conf_dest='BUILD_DRIVER_PORTAUDIO') - portaudio.check(header_name='windows.h') # only build portaudio on windows portaudio.check_cfg( package='portaudio-2.0 >= 19', uselib_store='PORTAUDIO',