diff --git a/windows/JackWinNamedPipeClientChannel.cpp b/windows/JackWinNamedPipeClientChannel.cpp index edea652a..7f8f9588 100644 --- a/windows/JackWinNamedPipeClientChannel.cpp +++ b/windows/JackWinNamedPipeClientChannel.cpp @@ -112,10 +112,10 @@ void JackWinNamedPipeClientChannel::ServerAsyncCall(JackRequest* req, JackResult } } -void JackWinNamedPipeClientChannel::ClientNew(const char* name, int* shared_engine, int* shared_client, int* shared_graph, int* result) +void JackWinNamedPipeClientChannel::ClientOpen(const char* name, int* shared_engine, int* shared_client, int* shared_graph, int* result) { - JackClientNewRequest req(name); - JackClientNewResult res; + JackClientOpenRequest req(name); + JackClientOpenResult res; ServerSyncCall(&req, &res, result); *shared_engine = res.fSharedEngine; *shared_client = res.fSharedClient; diff --git a/windows/JackWinNamedPipeClientChannel.h b/windows/JackWinNamedPipeClientChannel.h index 70a7ec7f..1dac996b 100644 --- a/windows/JackWinNamedPipeClientChannel.h +++ b/windows/JackWinNamedPipeClientChannel.h @@ -56,7 +56,7 @@ class JackWinNamedPipeClientChannel : public JackClientChannelInterface, public int Start(); void Stop(); - void ClientNew(const char* name, int* shared_engine, int* shared_client, int* shared_graph, int* result); + void ClientOpen(const char* name, int* shared_engine, int* shared_client, int* shared_graph, int* result); void ClientClose(int refnum, int* result); void ClientActivate(int refnum, int* result); diff --git a/windows/JackWinNamedPipeServerChannel.cpp b/windows/JackWinNamedPipeServerChannel.cpp index 285a122d..ab4244e8 100644 --- a/windows/JackWinNamedPipeServerChannel.cpp +++ b/windows/JackWinNamedPipeServerChannel.cpp @@ -106,10 +106,10 @@ int JackClientPipeThread::HandleRequest() // Read data switch (header.fType) { - case JackRequest::kClientNew: { - JackLog("JackRequest::ClientNew\n"); - JackClientNewRequest req; - JackClientNewResult res; + case JackRequest::kClientOpen: { + JackLog("JackRequest::ClientOpen\n"); + JackClientOpenRequest req; + JackClientOpenResult res; if (req.Read(fPipe) == 0) AddClient(req.fName, &res.fSharedEngine, &res.fSharedClient, &res.fSharedGraph, &res.fResult); res.Write(fPipe); @@ -121,7 +121,7 @@ int JackClientPipeThread::HandleRequest() JackClientCloseRequest req; JackResult res; if (req.Read(fPipe) == 0) - res.fResult = fServer->GetEngine()->ClientClose(req.fRefNum); + res.fResult = fServer->GetEngine()->ClientExternalClose(req.fRefNum); res.Write(fPipe); RemoveClient(); ret = -1; @@ -271,7 +271,7 @@ void JackClientPipeThread::AddClient(char* name, int* shared_engine, int* shared { JackLog("JackClientPipeThread::AddClient %s\n", name); fRefNum = -1; - *result = fServer->GetEngine()->ClientNew(name, &fRefNum, shared_engine, shared_client, shared_graph); + *result = fServer->GetEngine()->ClientExternalOpen(name, &fRefNum, shared_engine, shared_client, shared_graph); } void JackClientPipeThread::RemoveClient()