From 558f79cc5fec5bb2e7a11596cc512c900d1dfbb2 Mon Sep 17 00:00:00 2001 From: sletz Date: Sat, 23 Dec 2006 14:33:36 +0000 Subject: [PATCH] shared_ports renamed to shared_graph. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1323 0c269be4-1314-0410-8aa9-9f06e86f4224 --- ChangeLog | 4 + common/JackChannel.h | 2 +- common/JackLibClient.cpp | 6 +- common/JackRequest.h | 8 +- common/JackServer.h | 3 +- common/JackSocketClientChannel.cpp | 4 +- common/JackSocketClientChannel.h | 2 +- common/JackSocketServerChannel.cpp | 6 +- common/JackSocketServerChannel.h | 2 +- macosx/JackMacEngineRPC.cpp | 4 +- macosx/JackMachClientChannel.cpp | 4 +- macosx/JackMachClientChannel.h | 2 +- macosx/JackMachServerChannel.cpp | 4 +- macosx/JackMachServerChannel.h | 2 +- macosx/RPC/JackRPCClientServer.c | 4 +- macosx/RPC/JackRPCClientUser.c | 4 +- macosx/RPC/JackRPCEngine.defs | 2 +- macosx/RPC/JackRPCEngine.h | 4 +- macosx/RPC/JackRPCEngineServer.c | 10 +-- macosx/RPC/JackRPCEngineUser.c | 96 +++++++++++------------ windows/JackWinNamedPipeClientChannel.cpp | 4 +- windows/JackWinNamedPipeClientChannel.h | 2 +- windows/JackWinNamedPipeServerChannel.cpp | 12 +-- windows/JackWinNamedPipeServerChannel.h | 2 +- 24 files changed, 98 insertions(+), 95 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53c77e3d..ea6e6437 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ Jackdmp changes log --------------------------- +2006-12-23 Stephane Letz + + * shared_ports renamed to shared_graph. + 2006-12-15 Stephane Letz * Move client refnum management in JackEngine. diff --git a/common/JackChannel.h b/common/JackChannel.h index 5d4344ac..d02d902d 100644 --- a/common/JackChannel.h +++ b/common/JackChannel.h @@ -67,7 +67,7 @@ class JackClientChannelInterface virtual void Stop() {} - virtual void ClientNew(const char* name, int* shared_engine, int* shared_client, int* shared_ports, int* result) + virtual void ClientNew(const char* name, int* shared_engine, int* shared_client, int* shared_graph, int* result) {} virtual void ClientNew(const char* name, int* ref, JackEngineControl** shared_engine, JackGraphManager** shared_manager, JackClientInterface* client, int* result) {} diff --git a/common/JackLibClient.cpp b/common/JackLibClient.cpp index 5c8a13e5..ad4add9a 100644 --- a/common/JackLibClient.cpp +++ b/common/JackLibClient.cpp @@ -63,7 +63,7 @@ JackLibClient::~JackLibClient() int JackLibClient::Open(const char* name) { - int shared_engine, shared_client, shared_ports, result; + int shared_engine, shared_client, shared_graph, result; JackLog("JackLibClient::Open %s\n", name); // Open server/client channel @@ -79,7 +79,7 @@ int JackLibClient::Open(const char* name) } // Require new client - fChannel->ClientNew(name, &shared_engine, &shared_client, &shared_ports, &result); + fChannel->ClientNew(name, &shared_engine, &shared_client, &shared_graph, &result); if (result < 0) { jack_error("Cannot open %s client", name); goto error; @@ -88,7 +88,7 @@ int JackLibClient::Open(const char* name) try { // Map shared memory segments JackLibGlobals::fGlobals->fEngineControl = shared_engine; - JackLibGlobals::fGlobals->fGraphManager = shared_ports; + JackLibGlobals::fGlobals->fGraphManager = shared_graph; fClientControl = shared_client; jack_verbose = GetEngineControl()->fVerbose; } catch (int n) { diff --git a/common/JackRequest.h b/common/JackRequest.h index 39e63ea5..9338f432 100644 --- a/common/JackRequest.h +++ b/common/JackRequest.h @@ -150,14 +150,14 @@ struct JackClientNewResult : public JackResult int fSharedEngine; int fSharedClient; - int fSharedPorts; + int fSharedGraph; uint32_t fProtocolVersion; - JackClientNewResult() - :fSharedEngine(-1), fSharedClient(-1), fSharedPorts(-1), fProtocolVersion(0) + JackClientNewResult() + :fSharedEngine(-1), fSharedClient(-1), fSharedGraph(-1), fProtocolVersion(0) {} JackClientNewResult(int32_t status, int index1, int index2, int index3) - : JackResult(status), fSharedEngine(index1), fSharedClient(index2), fSharedPorts(index3), fProtocolVersion(0) + : JackResult(status), fSharedEngine(index1), fSharedClient(index2), fSharedGraph(index3), fProtocolVersion(0) {} virtual int Read(JackChannelTransaction* trans) diff --git a/common/JackServer.h b/common/JackServer.h index dcc4674b..7c4ce030 100644 --- a/common/JackServer.h +++ b/common/JackServer.h @@ -67,8 +67,7 @@ class EXPORT JackServer virtual ~JackServer(); int Open(jack_driver_desc_t* driver_desc, JSList* driver_params); - - int Close(); + int Close(); int Start(); int Stop(); diff --git a/common/JackSocketClientChannel.cpp b/common/JackSocketClientChannel.cpp index 9f2bd0ea..b21a9df4 100644 --- a/common/JackSocketClientChannel.cpp +++ b/common/JackSocketClientChannel.cpp @@ -113,14 +113,14 @@ void JackSocketClientChannel::ServerAsyncCall(JackRequest* req, JackResult* res, } } -void JackSocketClientChannel::ClientNew(const char* name, int* shared_engine, int* shared_client, int* shared_ports, int* result) +void JackSocketClientChannel::ClientNew(const char* name, int* shared_engine, int* shared_client, int* shared_graph, int* result) { JackClientNewRequest req(name); JackClientNewResult res; ServerSyncCall(&req, &res, result); *shared_engine = res.fSharedEngine; *shared_client = res.fSharedClient; - *shared_ports = res.fSharedPorts; + *shared_graph = res.fSharedGraph; } void JackSocketClientChannel::ClientClose(int refnum, int* result) diff --git a/common/JackSocketClientChannel.h b/common/JackSocketClientChannel.h index 35e7d96d..518e33ea 100644 --- a/common/JackSocketClientChannel.h +++ b/common/JackSocketClientChannel.h @@ -57,7 +57,7 @@ class JackSocketClientChannel : public JackClientChannelInterface, public JackRu int Start(); void Stop(); - void ClientNew(const char* name, int* shared_engine, int* shared_client, int* shared_ports, int* result); + void ClientNew(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/common/JackSocketServerChannel.cpp b/common/JackSocketServerChannel.cpp index f138a086..5fc60747 100644 --- a/common/JackSocketServerChannel.cpp +++ b/common/JackSocketServerChannel.cpp @@ -88,11 +88,11 @@ void JackSocketServerChannel::CreateClient() } } -void JackSocketServerChannel::AddClient(int fd, char* name, int* shared_engine, int* shared_client, int* shared_ports, int* result) +void JackSocketServerChannel::AddClient(int fd, char* name, int* shared_engine, int* shared_client, int* shared_graph, int* result) { JackLog("JackSocketServerChannel::AddClient\n"); int refnum = -1; - *result = fServer->GetEngine()->ClientNew(name, &refnum, shared_engine, shared_client, shared_ports); + *result = fServer->GetEngine()->ClientNew(name, &refnum, shared_engine, shared_client, shared_graph); if (*result == 0) { fSocketTable[fd].first = refnum; fRebuild = true; @@ -155,7 +155,7 @@ int JackSocketServerChannel::HandleRequest(int fd) JackClientNewRequest req; JackClientNewResult res; if (req.Read(socket) == 0) - AddClient(fd, req.fName, &res.fSharedEngine, &res.fSharedClient, &res.fSharedPorts, &res.fResult); + AddClient(fd, req.fName, &res.fSharedEngine, &res.fSharedClient, &res.fSharedGraph, &res.fResult); res.Write(socket); break; } diff --git a/common/JackSocketServerChannel.h b/common/JackSocketServerChannel.h index 0a00ae3c..fa8a99f9 100644 --- a/common/JackSocketServerChannel.h +++ b/common/JackSocketServerChannel.h @@ -47,7 +47,7 @@ class JackSocketServerChannel : public JackServerChannelInterface, public JackRu int HandleRequest(int fd); void CreateClient(); - void AddClient(int fd, char* name, int* shared_engine, int* shared_client, int* shared_ports, int* result); + void AddClient(int fd, char* name, int* shared_engine, int* shared_client, int* shared_graph, int* result); void RemoveClient(int fd, int refnum); void KillClient(int fd); void BuildPoolTable(); diff --git a/macosx/JackMacEngineRPC.cpp b/macosx/JackMacEngineRPC.cpp index 695c4b08..be789917 100644 --- a/macosx/JackMacEngineRPC.cpp +++ b/macosx/JackMacEngineRPC.cpp @@ -31,12 +31,12 @@ using namespace Jack; #define rpc_type kern_return_t // for astyle -rpc_type server_rpc_jack_client_new(mach_port_t server_port, client_name_t name, mach_port_t* private_port, int* shared_engine, int* shared_client, int* shared_ports, int* result) +rpc_type server_rpc_jack_client_new(mach_port_t server_port, client_name_t name, mach_port_t* private_port, int* shared_engine, int* shared_client, int* shared_graph, int* result) { JackLog("rpc_jack_client_new %s\n", name); JackMachServerChannel* channel = JackMachServerChannel::fPortTable[server_port]; assert(channel); - channel->AddClient((char*)name, private_port, shared_engine, shared_client, shared_ports, result); + channel->AddClient((char*)name, private_port, shared_engine, shared_client, shared_graph, result); return KERN_SUCCESS; } diff --git a/macosx/JackMachClientChannel.cpp b/macosx/JackMachClientChannel.cpp index 67eeedf3..bb085d2b 100644 --- a/macosx/JackMachClientChannel.cpp +++ b/macosx/JackMachClientChannel.cpp @@ -95,9 +95,9 @@ void JackMachClientChannel::Stop() fThread->Kill(); } -void JackMachClientChannel::ClientNew(const char* name, int* shared_engine, int* shared_client, int* shared_ports, int* result) +void JackMachClientChannel::ClientNew(const char* name, int* shared_engine, int* shared_client, int* shared_graph, int* result) { - kern_return_t res = rpc_jack_client_new(fServerPort.GetPort(), (char*)name, &fPrivatePort, shared_engine, shared_client, shared_ports, result); + kern_return_t res = rpc_jack_client_new(fServerPort.GetPort(), (char*)name, &fPrivatePort, shared_engine, shared_client, shared_graph, result); if (res != KERN_SUCCESS) { *result = -1; jack_error("JackMachClientChannel::ClientNew err = %s", mach_error_string(res)); diff --git a/macosx/JackMachClientChannel.h b/macosx/JackMachClientChannel.h index 4e68c1f0..484570ce 100644 --- a/macosx/JackMachClientChannel.h +++ b/macosx/JackMachClientChannel.h @@ -54,7 +54,7 @@ class JackMachClientChannel : public JackClientChannelInterface, public JackRunn int Start(); void Stop(); - void ClientNew(const char* name, int* shared_engine, int* shared_client, int* shared_ports, int* result); + void ClientNew(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/macosx/JackMachServerChannel.cpp b/macosx/JackMachServerChannel.cpp index 57d4578a..f2fd41ed 100644 --- a/macosx/JackMachServerChannel.cpp +++ b/macosx/JackMachServerChannel.cpp @@ -77,10 +77,10 @@ JackServer* JackMachServerChannel::GetServer() return fServer; } -void JackMachServerChannel::AddClient(char* name, mach_port_t* private_port, int* shared_engine, int* shared_client, int* shared_ports, int* result) +void JackMachServerChannel::AddClient(char* name, mach_port_t* private_port, int* shared_engine, int* shared_client, int* shared_graph, int* result) { int refnum = -1; - *result = GetEngine()->ClientNew(name, &refnum, shared_engine, shared_client, shared_ports); + *result = GetEngine()->ClientNew(name, &refnum, shared_engine, shared_client, shared_graph); if (*result == 0) { mach_port_t port = fServerPort.AddPort(); diff --git a/macosx/JackMachServerChannel.h b/macosx/JackMachServerChannel.h index b88a360a..d256a5f8 100644 --- a/macosx/JackMachServerChannel.h +++ b/macosx/JackMachServerChannel.h @@ -58,7 +58,7 @@ class JackMachServerChannel : public JackServerChannelInterface, public JackRunn JackEngine* GetEngine(); JackServer* GetServer(); - void AddClient(char* name, mach_port_t* private_port, int* shared_engine, int* shared_client, int* shared_ports, int* result); + void AddClient(char* name, mach_port_t* private_port, int* shared_engine, int* shared_client, int* shared_graph, int* result); void RemoveClient(mach_port_t private_port, int refnum); void KillClient(mach_port_t private_port); diff --git a/macosx/RPC/JackRPCClientServer.c b/macosx/RPC/JackRPCClientServer.c index af7d5a9e..20307670 100644 --- a/macosx/RPC/JackRPCClientServer.c +++ b/macosx/RPC/JackRPCClientServer.c @@ -1,7 +1,7 @@ /* * IDENTIFICATION: - * stub generated Mon Feb 13 17:58:24 2006 - * with a MiG generated Sun Mar 20 14:22:13 PST 2005 by root@b05.apple.com + * stub generated Sat Dec 23 15:21:20 2006 + * with a MiG generated Mon Sep 11 19:11:05 PDT 2006 by root@b09.apple.com * OPTIONS: */ diff --git a/macosx/RPC/JackRPCClientUser.c b/macosx/RPC/JackRPCClientUser.c index 7fe935fe..30daa0c3 100644 --- a/macosx/RPC/JackRPCClientUser.c +++ b/macosx/RPC/JackRPCClientUser.c @@ -1,7 +1,7 @@ /* * IDENTIFICATION: - * stub generated Mon Feb 13 17:58:24 2006 - * with a MiG generated Sun Mar 20 14:22:13 PST 2005 by root@b05.apple.com + * stub generated Sat Dec 23 15:21:20 2006 + * with a MiG generated Mon Sep 11 19:11:05 PDT 2006 by root@b09.apple.com * OPTIONS: */ #define __MIG_check__Reply__JackRPCClient_subsystem__ 1 diff --git a/macosx/RPC/JackRPCEngine.defs b/macosx/RPC/JackRPCEngine.defs index a833529d..a91fbcf2 100644 --- a/macosx/RPC/JackRPCEngine.defs +++ b/macosx/RPC/JackRPCEngine.defs @@ -34,7 +34,7 @@ routine rpc_jack_client_new( out private_port : mach_port_make_send_t; out shared_engine : int; out shared_client : int; - out shared_ports : int; + out shared_graph : int; out result : int); routine rpc_jack_client_close( diff --git a/macosx/RPC/JackRPCEngine.h b/macosx/RPC/JackRPCEngine.h index 753d26dd..7b828dce 100644 --- a/macosx/RPC/JackRPCEngine.h +++ b/macosx/RPC/JackRPCEngine.h @@ -56,7 +56,7 @@ kern_return_t rpc_jack_client_new mach_port_t *private_port, int *shared_engine, int *shared_client, - int *shared_ports, + int *shared_graph, int *result ); @@ -511,7 +511,7 @@ union __RequestUnion__JackRPCEngine_subsystem { NDR_record_t NDR; int shared_engine; int shared_client; - int shared_ports; + int shared_graph; int result; } __Reply__rpc_jack_client_new_t; #ifdef __MigPackStructs diff --git a/macosx/RPC/JackRPCEngineServer.c b/macosx/RPC/JackRPCEngineServer.c index 76000513..5e32627c 100644 --- a/macosx/RPC/JackRPCEngineServer.c +++ b/macosx/RPC/JackRPCEngineServer.c @@ -1,7 +1,7 @@ /* * IDENTIFICATION: - * stub generated Mon Feb 13 17:58:24 2006 - * with a MiG generated Sun Mar 20 14:22:13 PST 2005 by root@b05.apple.com + * stub generated Sat Dec 23 15:21:20 2006 + * with a MiG generated Mon Sep 11 19:11:05 PDT 2006 by root@b09.apple.com * OPTIONS: */ @@ -317,7 +317,7 @@ NDR_record_t NDR; int shared_engine; int shared_client; - int shared_ports; + int shared_graph; int result; } __Reply__rpc_jack_client_new_t; #ifdef __MigPackStructs @@ -698,7 +698,7 @@ kern_return_t server_rpc_jack_client_new mach_port_t *private_port, int *shared_engine, int *shared_client, - int *shared_ports, + int *shared_graph, int *result ); @@ -764,7 +764,7 @@ mig_internal novalue _Xrpc_jack_client_new #endif /* UseStaticTemplates */ - RetCode = server_rpc_jack_client_new(In0P->Head.msgh_request_port, In0P->client_name, &OutP->private_port.name, &OutP->shared_engine, &OutP->shared_client, &OutP->shared_ports, &OutP->result); + RetCode = server_rpc_jack_client_new(In0P->Head.msgh_request_port, In0P->client_name, &OutP->private_port.name, &OutP->shared_engine, &OutP->shared_client, &OutP->shared_graph, &OutP->result); if (RetCode != KERN_SUCCESS) { MIG_RETURN_ERROR(OutP, RetCode); } diff --git a/macosx/RPC/JackRPCEngineUser.c b/macosx/RPC/JackRPCEngineUser.c index 85234c31..3ecf9e6e 100644 --- a/macosx/RPC/JackRPCEngineUser.c +++ b/macosx/RPC/JackRPCEngineUser.c @@ -1,7 +1,7 @@ /* * IDENTIFICATION: - * stub generated Mon Feb 13 17:58:24 2006 - * with a MiG generated Sun Mar 20 14:22:13 PST 2005 by root@b05.apple.com + * stub generated Sat Dec 23 15:21:20 2006 + * with a MiG generated Mon Sep 11 19:11:05 PDT 2006 by root@b09.apple.com * OPTIONS: */ #define __MIG_check__Reply__JackRPCEngine_subsystem__ 1 @@ -153,25 +153,25 @@ #endif /* __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_client__defined */ -#ifndef __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_ports__defined +#ifndef __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_graph__defined #if defined(__NDR_convert__int_rep__JackRPCEngine__int__defined) -#define __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_ports__defined -#define __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_ports(a, f) \ +#define __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_graph__defined +#define __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_graph(a, f) \ __NDR_convert__int_rep__JackRPCEngine__int((int *)(a), f) #elif defined(__NDR_convert__int_rep__int__defined) -#define __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_ports__defined -#define __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_ports(a, f) \ +#define __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_graph__defined +#define __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_graph(a, f) \ __NDR_convert__int_rep__int((int *)(a), f) #elif defined(__NDR_convert__int_rep__JackRPCEngine__int32_t__defined) -#define __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_ports__defined -#define __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_ports(a, f) \ +#define __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_graph__defined +#define __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_graph(a, f) \ __NDR_convert__int_rep__JackRPCEngine__int32_t((int32_t *)(a), f) #elif defined(__NDR_convert__int_rep__int32_t__defined) -#define __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_ports__defined -#define __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_ports(a, f) \ +#define __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_graph__defined +#define __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_graph(a, f) \ __NDR_convert__int_rep__int32_t((int32_t *)(a), f) #endif /* defined(__NDR_convert__*__defined) */ -#endif /* __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_ports__defined */ +#endif /* __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_graph__defined */ #ifndef __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__result__defined @@ -237,25 +237,25 @@ #endif /* __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_client__defined */ -#ifndef __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_ports__defined +#ifndef __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_graph__defined #if defined(__NDR_convert__char_rep__JackRPCEngine__int__defined) -#define __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_ports__defined -#define __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_ports(a, f) \ +#define __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_graph__defined +#define __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_graph(a, f) \ __NDR_convert__char_rep__JackRPCEngine__int((int *)(a), f) #elif defined(__NDR_convert__char_rep__int__defined) -#define __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_ports__defined -#define __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_ports(a, f) \ +#define __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_graph__defined +#define __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_graph(a, f) \ __NDR_convert__char_rep__int((int *)(a), f) #elif defined(__NDR_convert__char_rep__JackRPCEngine__int32_t__defined) -#define __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_ports__defined -#define __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_ports(a, f) \ +#define __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_graph__defined +#define __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_graph(a, f) \ __NDR_convert__char_rep__JackRPCEngine__int32_t((int32_t *)(a), f) #elif defined(__NDR_convert__char_rep__int32_t__defined) -#define __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_ports__defined -#define __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_ports(a, f) \ +#define __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_graph__defined +#define __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_graph(a, f) \ __NDR_convert__char_rep__int32_t((int32_t *)(a), f) #endif /* defined(__NDR_convert__*__defined) */ -#endif /* __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_ports__defined */ +#endif /* __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_graph__defined */ #ifndef __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__result__defined @@ -321,25 +321,25 @@ #endif /* __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_client__defined */ -#ifndef __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_ports__defined +#ifndef __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_graph__defined #if defined(__NDR_convert__float_rep__JackRPCEngine__int__defined) -#define __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_ports__defined -#define __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_ports(a, f) \ +#define __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_graph__defined +#define __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_graph(a, f) \ __NDR_convert__float_rep__JackRPCEngine__int((int *)(a), f) #elif defined(__NDR_convert__float_rep__int__defined) -#define __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_ports__defined -#define __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_ports(a, f) \ +#define __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_graph__defined +#define __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_graph(a, f) \ __NDR_convert__float_rep__int((int *)(a), f) #elif defined(__NDR_convert__float_rep__JackRPCEngine__int32_t__defined) -#define __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_ports__defined -#define __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_ports(a, f) \ +#define __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_graph__defined +#define __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_graph(a, f) \ __NDR_convert__float_rep__JackRPCEngine__int32_t((int32_t *)(a), f) #elif defined(__NDR_convert__float_rep__int32_t__defined) -#define __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_ports__defined -#define __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_ports(a, f) \ +#define __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_graph__defined +#define __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_graph(a, f) \ __NDR_convert__float_rep__int32_t((int32_t *)(a), f) #endif /* defined(__NDR_convert__*__defined) */ -#endif /* __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_ports__defined */ +#endif /* __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_graph__defined */ #ifndef __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__result__defined @@ -405,7 +405,7 @@ mig_internal kern_return_t __MIG_check__Reply__rpc_jack_client_new_t(__Reply__rp #if defined(__NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_engine__defined) || \ defined(__NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_client__defined) || \ - defined(__NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_ports__defined) || \ + defined(__NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_graph__defined) || \ defined(__NDR_convert__int_rep__Reply__rpc_jack_client_new_t__result__defined) if (Out0P->NDR.int_rep != NDR_record.int_rep) { #if defined(__NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_engine__defined) @@ -414,9 +414,9 @@ mig_internal kern_return_t __MIG_check__Reply__rpc_jack_client_new_t(__Reply__rp #if defined(__NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_client__defined) __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_client(&Out0P->shared_client, Out0P->NDR.int_rep); #endif /* __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_client__defined */ -#if defined(__NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_ports__defined) - __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_ports(&Out0P->shared_ports, Out0P->NDR.int_rep); -#endif /* __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_ports__defined */ +#if defined(__NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_graph__defined) + __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_graph(&Out0P->shared_graph, Out0P->NDR.int_rep); +#endif /* __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__shared_graph__defined */ #if defined(__NDR_convert__int_rep__Reply__rpc_jack_client_new_t__result__defined) __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__result(&Out0P->result, Out0P->NDR.int_rep); #endif /* __NDR_convert__int_rep__Reply__rpc_jack_client_new_t__result__defined */ @@ -425,7 +425,7 @@ mig_internal kern_return_t __MIG_check__Reply__rpc_jack_client_new_t(__Reply__rp #if defined(__NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_engine__defined) || \ defined(__NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_client__defined) || \ - defined(__NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_ports__defined) || \ + defined(__NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_graph__defined) || \ defined(__NDR_convert__char_rep__Reply__rpc_jack_client_new_t__result__defined) if (Out0P->NDR.char_rep != NDR_record.char_rep) { #if defined(__NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_engine__defined) @@ -434,9 +434,9 @@ mig_internal kern_return_t __MIG_check__Reply__rpc_jack_client_new_t(__Reply__rp #if defined(__NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_client__defined) __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_client(&Out0P->shared_client, Out0P->NDR.char_rep); #endif /* __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_client__defined */ -#if defined(__NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_ports__defined) - __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_ports(&Out0P->shared_ports, Out0P->NDR.char_rep); -#endif /* __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_ports__defined */ +#if defined(__NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_graph__defined) + __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_graph(&Out0P->shared_graph, Out0P->NDR.char_rep); +#endif /* __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__shared_graph__defined */ #if defined(__NDR_convert__char_rep__Reply__rpc_jack_client_new_t__result__defined) __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__result(&Out0P->result, Out0P->NDR.char_rep); #endif /* __NDR_convert__char_rep__Reply__rpc_jack_client_new_t__result__defined */ @@ -445,7 +445,7 @@ mig_internal kern_return_t __MIG_check__Reply__rpc_jack_client_new_t(__Reply__rp #if defined(__NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_engine__defined) || \ defined(__NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_client__defined) || \ - defined(__NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_ports__defined) || \ + defined(__NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_graph__defined) || \ defined(__NDR_convert__float_rep__Reply__rpc_jack_client_new_t__result__defined) if (Out0P->NDR.float_rep != NDR_record.float_rep) { #if defined(__NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_engine__defined) @@ -454,9 +454,9 @@ mig_internal kern_return_t __MIG_check__Reply__rpc_jack_client_new_t(__Reply__rp #if defined(__NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_client__defined) __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_client(&Out0P->shared_client, Out0P->NDR.float_rep); #endif /* __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_client__defined */ -#if defined(__NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_ports__defined) - __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_ports(&Out0P->shared_ports, Out0P->NDR.float_rep); -#endif /* __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_ports__defined */ +#if defined(__NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_graph__defined) + __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_graph(&Out0P->shared_graph, Out0P->NDR.float_rep); +#endif /* __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__shared_graph__defined */ #if defined(__NDR_convert__float_rep__Reply__rpc_jack_client_new_t__result__defined) __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__result(&Out0P->result, Out0P->NDR.float_rep); #endif /* __NDR_convert__float_rep__Reply__rpc_jack_client_new_t__result__defined */ @@ -478,7 +478,7 @@ mig_external kern_return_t rpc_jack_client_new mach_port_t *private_port, int *shared_engine, int *shared_client, - int *shared_ports, + int *shared_graph, int *result ) { @@ -508,7 +508,7 @@ mig_external kern_return_t rpc_jack_client_new NDR_record_t NDR; int shared_engine; int shared_client; - int shared_ports; + int shared_graph; int result; mach_msg_trailer_t trailer; } Reply; @@ -528,7 +528,7 @@ mig_external kern_return_t rpc_jack_client_new NDR_record_t NDR; int shared_engine; int shared_client; - int shared_ports; + int shared_graph; int result; } __Reply; #ifdef __MigPackStructs @@ -589,7 +589,7 @@ mig_external kern_return_t rpc_jack_client_new *shared_client = Out0P->shared_client; - *shared_ports = Out0P->shared_ports; + *shared_graph = Out0P->shared_graph; *result = Out0P->result; diff --git a/windows/JackWinNamedPipeClientChannel.cpp b/windows/JackWinNamedPipeClientChannel.cpp index c3ec2d8e..8f32b4cd 100644 --- a/windows/JackWinNamedPipeClientChannel.cpp +++ b/windows/JackWinNamedPipeClientChannel.cpp @@ -112,14 +112,14 @@ void JackWinNamedPipeClientChannel::ServerAsyncCall(JackRequest* req, JackResult } } -void JackWinNamedPipeClientChannel::ClientNew(const char* name, int* shared_engine, int* shared_client, int* shared_ports, int* result) +void JackWinNamedPipeClientChannel::ClientNew(const char* name, int* shared_engine, int* shared_client, int* shared_graph, int* result) { JackClientNewRequest req(name); JackClientNewResult res; ServerSyncCall(&req, &res, result); *shared_engine = res.fSharedEngine; *shared_client = res.fSharedClient; - *shared_ports = res.fSharedPorts; + *shared_graph = res.fSharedGraph; } void JackWinNamedPipeClientChannel::ClientClose(int refnum, int* result) diff --git a/windows/JackWinNamedPipeClientChannel.h b/windows/JackWinNamedPipeClientChannel.h index 4138db09..70a7ec7f 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_ports, int* result); + void ClientNew(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 cf7bd994..94d9f219 100644 --- a/windows/JackWinNamedPipeServerChannel.cpp +++ b/windows/JackWinNamedPipeServerChannel.cpp @@ -16,10 +16,10 @@ Copyright (C) 2004-2006 Grame Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#ifdef WIN32 -#pragma warning (disable : 4786) -#endif + +#ifdef WIN32 +#pragma warning (disable : 4786) +#endif #include "JackWinNamedPipeServerChannel.h" #include "JackRequest.h" @@ -267,11 +267,11 @@ int JackClientPipeThread::HandleRequest() return ret; } -void JackClientPipeThread::AddClient(char* name, int* shared_engine, int* shared_client, int* shared_ports, int* result) +void JackClientPipeThread::AddClient(char* name, int* shared_engine, int* shared_client, int* shared_graph, int* result) { JackLog("JackClientPipeThread::AddClient %s\n", name); fRefNum = -1; - *result = fServer->GetEngine()->ClientNew(name, &fRefNum, shared_engine, shared_client, shared_ports); + *result = fServer->GetEngine()->ClientNew(name, &fRefNum, shared_engine, shared_client, shared_graph); } void JackClientPipeThread::RemoveClient() diff --git a/windows/JackWinNamedPipeServerChannel.h b/windows/JackWinNamedPipeServerChannel.h index 2b16191e..e186107e 100644 --- a/windows/JackWinNamedPipeServerChannel.h +++ b/windows/JackWinNamedPipeServerChannel.h @@ -39,7 +39,7 @@ class JackClientPipeThread : public JackRunnableInterface JackThread* fThread; int fRefNum; - void AddClient(char* name, int* shared_engine, int* shared_client, int* shared_ports, int* result); + void AddClient(char* name, int* shared_engine, int* shared_client, int* shared_graph, int* result); void RemoveClient(); void KillClient();