From 54bfc89b6fa28d5f26f91be9a7526479b9a637c0 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sat, 16 Nov 2024 01:51:28 -0800 Subject: [PATCH] Lower the priority of the JACK backend --- alc/alc.cpp | 6 +++--- utils/alsoft-config/mainwindow.cpp | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/alc/alc.cpp b/alc/alc.cpp index 32e18ee7..fe304c3d 100644 --- a/alc/alc.cpp +++ b/alc/alc.cpp @@ -244,9 +244,6 @@ std::array BackendList{ #if HAVE_OSS BackendInfo{"oss", OSSBackendFactory::getFactory}, #endif -#if HAVE_JACK - BackendInfo{"jack", JackBackendFactory::getFactory}, -#endif #if HAVE_DSOUND BackendInfo{"dsound", DSoundBackendFactory::getFactory}, #endif @@ -259,6 +256,9 @@ std::array BackendList{ #if HAVE_SDL2 BackendInfo{"sdl2", SDL2BackendFactory::getFactory}, #endif +#if HAVE_JACK + BackendInfo{"jack", JackBackendFactory::getFactory}, +#endif #if HAVE_OTHERIO BackendInfo{"otherio", OtherIOBackendFactory::getFactory}, #endif diff --git a/utils/alsoft-config/mainwindow.cpp b/utils/alsoft-config/mainwindow.cpp index d46b677a..e35f3c95 100644 --- a/utils/alsoft-config/mainwindow.cpp +++ b/utils/alsoft-config/mainwindow.cpp @@ -40,17 +40,17 @@ constexpr std::array backendList{ #if HAVE_PULSEAUDIO BackendNamePair{ "pulse", "PulseAudio" }, #endif -#if HAVE_ALSA - BackendNamePair{ "alsa", "ALSA" }, -#endif -#if HAVE_JACK - BackendNamePair{ "jack", "JACK" }, +#if HAVE_WASAPI + BackendNamePair{ "wasapi", "WASAPI" }, #endif #if HAVE_COREAUDIO BackendNamePair{ "core", "CoreAudio" }, #endif -#if HAVE_OSS - BackendNamePair{ "oss", "OSS" }, +#if HAVE_OPENSL + BackendNamePair{ "opensl", "OpenSL" }, +#endif +#if HAVE_ALSA + BackendNamePair{ "alsa", "ALSA" }, #endif #if HAVE_SOLARIS BackendNamePair{ "solaris", "Solaris" }, @@ -58,8 +58,8 @@ constexpr std::array backendList{ #if HAVE_SNDIO BackendNamePair{ "sndio", "SndIO" }, #endif -#if HAVE_WASAPI - BackendNamePair{ "wasapi", "WASAPI" }, +#if HAVE_OSS + BackendNamePair{ "oss", "OSS" }, #endif #if HAVE_DSOUND BackendNamePair{ "dsound", "DirectSound" }, @@ -70,8 +70,8 @@ constexpr std::array backendList{ #if HAVE_PORTAUDIO BackendNamePair{ "port", "PortAudio" }, #endif -#if HAVE_OPENSL - BackendNamePair{ "opensl", "OpenSL" }, +#if HAVE_JACK + BackendNamePair{ "jack", "JACK" }, #endif BackendNamePair{ "null", "Null Output" }, -- 2.11.4.GIT