Rename JACK to "JACK/Pipewire" on Linux (2/2)
This commit is contained in:
parent
a76b2ed1bb
commit
cb34845498
@ -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;
|
||||
}
|
||||
|
@ -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.
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user