Browse Source

Cleanup

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1372 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.62
sletz 17 years ago
parent
commit
6579d12179
3 changed files with 6 additions and 5 deletions
  1. +3
    -3
      common/JackAPI.cpp
  2. +1
    -1
      common/JackEngine.cpp
  3. +2
    -1
      common/JackLibGlobals.h

+ 3
- 3
common/JackAPI.cpp View File

@@ -1349,8 +1349,8 @@ EXPORT jack_status_t jack_internal_client_unload(jack_client_t* ext_client, jack
return JackFailure;
}

// Automatic jack server launch
// Automatic jack server launch
#ifndef WIN32

#define JACK_LOCATION
@@ -1502,5 +1502,5 @@ int try_start_server(jack_varargs_t* va, jack_options_t options, jack_status_t*
return 0;
}
#endif

+ 1
- 1
common/JackEngine.cpp View File

@@ -539,7 +539,7 @@ int JackEngine::ClientDeactivate(int refnum)

JackLog("JackEngine::ClientDeactivate ref = %ld name = %s\n", refnum, client->GetClientControl()->fName);
fGraphManager->Deactivate(refnum);
fLastSwitchUsecs = 0; // Force switch will occur next cycle, even when called with "dead" clients
fLastSwitchUsecs = 0; // Force switch to occur next cycle, even when called with "dead" clients
// Wait for graph state change to be effective
if (!fSignal->TimedWait(fEngineControl->fTimeOutUsecs * 10)) {


+ 2
- 1
common/JackLibGlobals.h View File

@@ -91,8 +91,9 @@ struct JackLibGlobals
static void CheckContext()
{
if (!(fClientCount > 0 && fGlobals))
if (!(fClientCount > 0 && fGlobals)) {
jack_error("Error !!! : client accessing an already desallocated library context");
}
}

};


Loading…
Cancel
Save