Commit 962ccb7d authored by sletz's avatar sletz
Browse files

Fix a bug in jack_test. Correct JackShmMem destructor. Correct and case in...

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
parent fb2ed949
......@@ -2,6 +2,10 @@
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>
* Fix a bug in JackLibClient::Open introduced when adding automatic client renaming.
......
......@@ -372,8 +372,8 @@ end:
// Hum... not sure about this, the following "close" code is called in the RT thread...
int result;
fThread->DropRealTime();
GetClientControl()->fActive = false;
fChannel->ClientDeactivate(GetClientControl()->fRefNum, &result);
Close(); // Not sure...
return false;
error:
......
......@@ -114,7 +114,7 @@ int JackLibClient::Open(const char* name, jack_options_t options, jack_status_t*
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;
error:
......
......@@ -73,9 +73,7 @@ class JackMem
{}
virtual ~JackMem()
{
UnlockMemoryImp(this, fSize);
}
{}
void LockMemory()
{
......@@ -118,9 +116,7 @@ class JackShmMem
}
virtual ~JackShmMem()
{
UnlockMemoryImp(this, fInfo.size);
}
{}
int GetShmIndex()
{
......
......@@ -171,6 +171,7 @@ bool JackMachSemaphore::Disconnect()
{
if (fSemaphore > 0) {
JackLog("JackMachSemaphore::Disconnect name = %s\n", fName);
fSemaphore = 0;
}
// Nothing to do
return true;
......
......@@ -596,9 +596,9 @@ int main (int argc, char *argv[])
client2 = jack_client_open(client_name1, jack_options, &status, server_name);
if (client2 != NULL) {
Log ("valid : a second client with the same name can be registered (client automatic renaming)\n");
jack_client_close(client2);
} else {
printf("!!! ERROR !!! Jackd server automatic renaming feature does not work!");
jack_client_close(client2);
}
/**
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment