Browse Source

Cleanup.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4660 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.9.5
sletz 13 years ago
parent
commit
d4dd32fce1
3 changed files with 13 additions and 15 deletions
  1. +1
    -1
      ChangeLog
  2. +11
    -13
      windows/JackWinNamedPipe.cpp
  3. +1
    -1
      windows/JackWinNamedPipeServerChannel.cpp

+ 1
- 1
ChangeLog View File

@@ -38,7 +38,7 @@ John Emmas

2012-01-01 Stephane Letz <letz@grame.fr>

* Fix in midiseq.c.
* Adrian Knoth fix in midiseq.c.

2011-12-20 Stephane Letz <letz@grame.fr>



+ 11
- 13
windows/JackWinNamedPipe.cpp View File

@@ -290,9 +290,9 @@ bool JackWinNamedPipeServer::Accept()
if (ConnectNamedPipe(fNamedPipe, NULL)) {
return true;
} else {
jack_error("Cannot bind server pipe name = %s err = %ld", fName, GetLastError());
jack_error("Cannot connect server pipe name = %s err = %ld", fName, GetLastError());
if (GetLastError() == ERROR_PIPE_CONNECTED) {
jack_error("pipe already connnected = %s ", fName);
jack_error("Pipe already connnected = %s", fName);
return true;
} else {
return false;
@@ -303,20 +303,18 @@ bool JackWinNamedPipeServer::Accept()
JackWinNamedPipeClient* JackWinNamedPipeServer::AcceptClient()
{
if (ConnectNamedPipe(fNamedPipe, NULL)) {
JackWinNamedPipeClient* client = new JackWinNamedPipeClient(fNamedPipe, fName);
// Init the pipe to the default value
fNamedPipe = INVALID_HANDLE_VALUE;
return client;
return new JackWinNamedPipeClient(fNamedPipe, fName);;
} else {
switch (GetLastError()) {

case ERROR_PIPE_CONNECTED:
return new JackWinNamedPipeClient(fNamedPipe, fName);

default:
jack_error("Cannot connect server pipe name = %s err = %ld", fName, GetLastError());
return NULL;
break;
jack_error("Cannot connect server pipe name = %s err = %ld", fName, GetLastError());
if (GetLastError() == ERROR_PIPE_CONNECTED) {
jack_error("Pipe already connnected = %s", fName);
// Init the pipe to the default value
fNamedPipe = INVALID_HANDLE_VALUE;
return new JackWinNamedPipeClient(fNamedPipe, fName);
} else {
return NULL;
}
}
}


+ 1
- 1
windows/JackWinNamedPipeServerChannel.cpp View File

@@ -507,7 +507,7 @@ void JackWinNamedPipeServerChannel::Stop()

bool JackWinNamedPipeServerChannel::Init()
{
jack_log("JackWinNamedPipeServerChannel::Init ");
jack_log("JackWinNamedPipeServerChannel::Init");
JackWinNamedPipeClient* pipe;

// Accept first client, that is the JackWinNamedPipeServerNotifyChannel object


Loading…
Cancel
Save