Browse Source

Correct JackMessageBuffer::SetInitCallback.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4746 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.9.5
sletz 13 years ago
parent
commit
ef38cd3483
2 changed files with 10 additions and 5 deletions
  1. +7
    -3
      common/JackMessageBuffer.cpp
  2. +3
    -2
      windows/JackWinProcessSync.cpp

+ 7
- 3
common/JackMessageBuffer.cpp View File

@@ -44,8 +44,12 @@ JackMessageBuffer::~JackMessageBuffer()

bool JackMessageBuffer::Start()
{
fRunning = true;
return fThread.StartSync();
if (fThread.StartSync() == 0) {
fRunning = true;
return true;
} else {
return false;
}
}

bool JackMessageBuffer::Stop()
@@ -157,7 +161,7 @@ void JackMessageBufferAdd(int level, const char *message)

void JackMessageBuffer::SetInitCallback(JackThreadInitCallback callback, void *arg)
{
if (fInstance && fGuard.Lock()) {
if (fInstance && fInit && fGuard.Lock()) {
/* set up the callback */
fInitArg = arg;
fInit = callback;


+ 3
- 2
windows/JackWinProcessSync.cpp View File

@@ -134,8 +134,9 @@ bool JackWinProcessSync::LockedTimedWait(long usec)
HANDLE handles[] = { fMutex, fEvent };
DWORD res = WaitForMultipleObjects(2, handles, true, usec / 1000);
if ((res != WAIT_OBJECT_0) && (res != WAIT_TIMEOUT))
jack_error("ackWinProcessSync::LockedTimedWait WaitForMultipleObjects err = %d", GetLastError());
if ((res != WAIT_OBJECT_0) && (res != WAIT_TIMEOUT)) {
jack_error("JackWinProcessSync::LockedTimedWait WaitForMultipleObjects err = %d", GetLastError());
}
if (!ResetEvent(fEvent)) {
jack_error("JackWinProcessSync::LockedTimedWait ResetEvent err = %d", GetLastError());


Loading…
Cancel
Save