From 17a9ec8e3616ed2409eebfe1da7681ebe26a99ca Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Wed, 24 Oct 2007 16:16:17 +0000
Subject: [PATCH] Working on Windows

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1646 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 windows/JackWinEvent.cpp                  | 10 +++++-----
 windows/JackWinNamedPipeServerChannel.cpp |  5 +++--
 windows/JackWinNamedPipeServerChannel.h   |  3 ++-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/windows/JackWinEvent.cpp b/windows/JackWinEvent.cpp
index b6b521e1..34c8bc4b 100644
--- a/windows/JackWinEvent.cpp
+++ b/windows/JackWinEvent.cpp
@@ -84,7 +84,7 @@ bool JackWinEvent::TimedWait(long usec)
 }
 
 // Client side : get the published semaphore from server
-bool JackWinEvent::ConnectInput(const char* server_name, const char* name)
+bool JackWinEvent::ConnectInput(const char* name, const char* server_name)
 {
     BuildName(name, server_name, fName);
     JackLog("JackWinEvent::Connect %s\n", fName);
@@ -103,14 +103,14 @@ bool JackWinEvent::ConnectInput(const char* server_name, const char* name)
     }
 }
 
-bool JackWinEvent::Connect(const char* server_name, const char* name)
+bool JackWinEvent::Connect(const char* name, const char* server_name)
 {
-    return ConnectInput(server_name, name);
+    return ConnectInput(name, server_name);
 }
 
-bool JackWinEvent::ConnectOutput(const char* server_name, const char* name)
+bool JackWinEvent::ConnectOutput(const char* name, const char* server_name)
 {
-    return ConnectInput(server_name, name);
+    return ConnectInput(name, server_name);
 }
 
 bool JackWinEvent::Disconnect()
diff --git a/windows/JackWinNamedPipeServerChannel.cpp b/windows/JackWinNamedPipeServerChannel.cpp
index 1c944bf3..d297189c 100644
--- a/windows/JackWinNamedPipeServerChannel.cpp
+++ b/windows/JackWinNamedPipeServerChannel.cpp
@@ -372,7 +372,8 @@ int JackWinNamedPipeServerChannel::Open(const char* server_name, JackServer* ser
 {
     JackLog("JackWinNamedPipeServerChannel::Open \n");
 
-    fServer = server;
+    fServer = server;
+	snprintf(fServerName, sizeof(fServerName), server_name);
 
     // Needed for internal connection from JackWinNamedPipeServerNotifyChannel object
     if (fRequestListenPipe.Bind(jack_server_dir, server_name, 0) < 0) {
@@ -426,7 +427,7 @@ bool JackWinNamedPipeServerChannel::Execute()
 {
     JackWinNamedPipeClient* pipe;
 
-    if (fRequestListenPipe.Bind(jack_server_dir, 0) < 0) {
+    if (fRequestListenPipe.Bind(jack_server_dir, fServerName, 0) < 0) {
         jack_error("JackWinNamedPipeServerChannel::Open : cannot create result listen pipe");
         return false;
     }
diff --git a/windows/JackWinNamedPipeServerChannel.h b/windows/JackWinNamedPipeServerChannel.h
index 57371230..7c756248 100644
--- a/windows/JackWinNamedPipeServerChannel.h
+++ b/windows/JackWinNamedPipeServerChannel.h
@@ -76,7 +76,8 @@ class JackWinNamedPipeServerChannel : public JackServerChannelInterface, public
 
         JackWinNamedPipeServer fRequestListenPipe;	// Pipe to create request socket for the client
         JackServer*	fServer;
-        JackThread*	fThread;						// Thread to execute the event loop
+        JackThread*	fThread;						// Thread to execute the event loop
+		char fServerName[64];
 
         std::list<JackClientPipeThread*> fClientList;