Browse Source

Fix a conflict with Audio Hijack in JackCoreAudioDriver.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3002 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.90
sletz 16 years ago
parent
commit
a281046055
2 changed files with 5 additions and 9 deletions
  1. +4
    -0
      ChangeLog
  2. +1
    -9
      macosx/coreaudio/JackCoreAudioDriver.cpp

+ 4
- 0
ChangeLog View File

@@ -23,6 +23,10 @@ Michael Voigt
Jackdmp changes log
---------------------------

2008-10-15 Stephane Letz <letz@grame.fr>
* Fix a conflict with Audio Hijack in JackCoreAudioDriver.

2008-10-09 Stephane Letz <letz@grame.fr>
* Use a mutex to make jack_client_open/jack_client_close thread safe, remove use of jack_init/jack_uninit.


+ 1
- 9
macosx/coreaudio/JackCoreAudioDriver.cpp View File

@@ -197,18 +197,10 @@ OSStatus JackCoreAudioDriver::MeasureCallback(AudioDeviceID inDevice,
{
JackCoreAudioDriver* driver = (JackCoreAudioDriver*)inClientData;
AudioDeviceStop(driver->fDeviceID, MeasureCallback);
/*
#ifdef MAC_OS_X_VERSION_10_5
AudioDeviceDestroyIOProcID(driver->fDeviceID, driver->fMesureCallbackID);
#else
AudioDeviceRemoveIOProc(driver->fDeviceID, MeasureCallback);
#endif
*/

AudioDeviceRemoveIOProc(driver->fDeviceID, MeasureCallback);
jack_log("JackCoreAudioDriver::MeasureCallback called");
JackMachThread::GetParams(&driver->fEngineControl->fPeriod, &driver->fEngineControl->fComputation, &driver->fEngineControl->fConstraint);
// Setup threadded based log function
set_threaded_log_function();
return noErr;


Loading…
Cancel
Save