From 6525215dcd3e04a08d564f481b51af47b16d99dc Mon Sep 17 00:00:00 2001 From: Nedko Arnaudov Date: Tue, 26 May 2009 03:41:54 +0300 Subject: [PATCH] revert b55ef77edb5c697b461aac71d9792f444ef04f92 (JACK_CLIENT_PID_OVERRIDE) This is actually not needed because ardour2 script is reusing the process --- common/JackLibClient.cpp | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/common/JackLibClient.cpp b/common/JackLibClient.cpp index 6a4be550..77e46aca 100644 --- a/common/JackLibClient.cpp +++ b/common/JackLibClient.cpp @@ -70,9 +70,6 @@ JackLibClient::~JackLibClient() int JackLibClient::Open(const char* server_name, const char* name, jack_options_t options, jack_status_t* status) { int shared_engine, shared_client, shared_graph, result; - int pid; - char * pid_str; - jack_log("JackLibClient::Open name = %s", name); strncpy(fServerName, server_name, sizeof(fServerName)); @@ -90,20 +87,8 @@ int JackLibClient::Open(const char* server_name, const char* name, jack_options_ goto error; } - pid = 0; - pid_str = getenv("JACK_CLIENT_PID_OVERRIDE"); - if (pid_str != NULL) - { - pid = atoi(pid_str); - } - - if (pid == 0) - { - pid = JackTools::GetPID(); - } - // Require new client - fChannel->ClientOpen(name_res, pid, &shared_engine, &shared_client, &shared_graph, &result); + fChannel->ClientOpen(name_res, JackTools::GetPID(), &shared_engine, &shared_client, &shared_graph, &result); if (result < 0) { jack_error("Cannot open %s client", name_res); goto error;