Browse Source

Fix a bug in jack_test. Correct JackShmMem destructor. Correct and case in JackClient::Execute. Correct JackMachSemaphore::Disconnect.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1527 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.65
sletz 18 years ago
parent
commit
962ccb7d2d
6 changed files with 10 additions and 9 deletions
  1. +4
    -0
      ChangeLog
  2. +1
    -1
      common/JackClient.cpp
  3. +1
    -1
      common/JackLibClient.cpp
  4. +2
    -6
      common/JackShmMem.h
  5. +1
    -0
      macosx/JackMachSemaphore.cpp
  6. +1
    -1
      tests/jack_test.cpp

+ 4
- 0
ChangeLog View File

@@ -2,6 +2,10 @@
Jackdmp changes log Jackdmp changes log
--------------------------- ---------------------------
2007-08-23 Stephane Letz <letz@grame.fr>
* Fix a bug in jack_test. Correct JackShmMem destructor. Correct and case in JackClient::Execute. Correct JackMachSemaphore::Disconnect.
2007-08-22 Stephane Letz <letz@grame.fr> 2007-08-22 Stephane Letz <letz@grame.fr>
* Fix a bug in JackLibClient::Open introduced when adding automatic client renaming. * Fix a bug in JackLibClient::Open introduced when adding automatic client renaming.


+ 1
- 1
common/JackClient.cpp View File

@@ -372,8 +372,8 @@ end:
// Hum... not sure about this, the following "close" code is called in the RT thread... // Hum... not sure about this, the following "close" code is called in the RT thread...
int result; int result;
fThread->DropRealTime(); fThread->DropRealTime();
GetClientControl()->fActive = false;
fChannel->ClientDeactivate(GetClientControl()->fRefNum, &result); fChannel->ClientDeactivate(GetClientControl()->fRefNum, &result);
Close(); // Not sure...
return false; return false;


error: error:


+ 1
- 1
common/JackLibClient.cpp View File

@@ -114,7 +114,7 @@ int JackLibClient::Open(const char* name, jack_options_t options, jack_status_t*
goto error; goto error;
} }


JackLog("JackLibClient::Open name = %s refnum = %ld\n", name_res, fClientControl->fRefNum);
JackLog("JackLibClient::Open name = %s refnum = %ld\n", name_res, fClientControl->fRefNum);
return 0; return 0;


error: error:


+ 2
- 6
common/JackShmMem.h View File

@@ -73,9 +73,7 @@ class JackMem
{} {}


virtual ~JackMem() virtual ~JackMem()
{
UnlockMemoryImp(this, fSize);
}
{}
void LockMemory() void LockMemory()
{ {
@@ -118,9 +116,7 @@ class JackShmMem
} }


virtual ~JackShmMem() virtual ~JackShmMem()
{
UnlockMemoryImp(this, fInfo.size);
}
{}


int GetShmIndex() int GetShmIndex()
{ {


+ 1
- 0
macosx/JackMachSemaphore.cpp View File

@@ -171,6 +171,7 @@ bool JackMachSemaphore::Disconnect()
{ {
if (fSemaphore > 0) { if (fSemaphore > 0) {
JackLog("JackMachSemaphore::Disconnect name = %s\n", fName); JackLog("JackMachSemaphore::Disconnect name = %s\n", fName);
fSemaphore = 0;
} }
// Nothing to do // Nothing to do
return true; return true;


+ 1
- 1
tests/jack_test.cpp View File

@@ -596,9 +596,9 @@ int main (int argc, char *argv[])
client2 = jack_client_open(client_name1, jack_options, &status, server_name); client2 = jack_client_open(client_name1, jack_options, &status, server_name);
if (client2 != NULL) { if (client2 != NULL) {
Log ("valid : a second client with the same name can be registered (client automatic renaming)\n"); Log ("valid : a second client with the same name can be registered (client automatic renaming)\n");
jack_client_close(client2);
} else { } else {
printf("!!! ERROR !!! Jackd server automatic renaming feature does not work!"); printf("!!! ERROR !!! Jackd server automatic renaming feature does not work!");
jack_client_close(client2);
} }


/** /**


Loading…
Cancel
Save