From cb3484549843a355389fc05927b6dc1439ef6c68 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 31 Jul 2024 04:44:04 +0200 Subject: [PATCH] Rename JACK to "JACK/Pipewire" on Linux (2/2) --- gtk2_ardour/ardour_ui_startup.cc | 8 +++++++- headless/load_session.cc | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/ardour_ui_startup.cc b/gtk2_ardour/ardour_ui_startup.cc index 9490527c0a..a2ac3b953b 100644 --- a/gtk2_ardour/ardour_ui_startup.cc +++ b/gtk2_ardour/ardour_ui_startup.cc @@ -860,7 +860,13 @@ ARDOUR_UI::load_from_application_api (const std::string& path) if (nsm) { unload_session(false, true); - if (!AudioEngine::instance()->set_backend("JACK", ARDOUR_COMMAND_LINE::backend_client_name, "")) { + if (!AudioEngine::instance()->set_backend( +#if ! (defined(__APPLE__) || defined(PLATFORM_WINDOWS)) + "JACK/Pipewire", +#else + "JACK", +#endif + ARDOUR_COMMAND_LINE::backend_client_name, "")) { error << _("NSM: The JACK backend is mandatory and can not be loaded.") << endmsg; return; } diff --git a/headless/load_session.cc b/headless/load_session.cc index d1f4c4d85f..ef06d35a73 100644 --- a/headless/load_session.cc +++ b/headless/load_session.cc @@ -49,10 +49,15 @@ using namespace PBD; static const char* localedir = LOCALEDIR; static string backend_client_name; -static string backend_name = "JACK"; static CrossThreadChannel xthread (true); static TestReceiver test_receiver; +#if ! (defined(__APPLE__) || defined(PLATFORM_WINDOWS)) +static string backend_name = "JACK/Pipewire"; +#else +static string backend_name = "JACK"; +#endif + /** @param dir Session directory. * @param state Session state file, without .ardour suffix. */