From 8064c87e0f08f0cfd24a7cddd25f447007bc3e1d Mon Sep 17 00:00:00 2001 From: sletz Date: Fri, 22 Feb 2008 17:53:25 +0000 Subject: [PATCH] Cleanup git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1877 0c269be4-1314-0410-8aa9-9f06e86f4224 --- macosx/JackCoreAudioDriver.cpp | 15 ++------------- macosx/JackCoreAudioDriver.h | 9 +-------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/macosx/JackCoreAudioDriver.cpp b/macosx/JackCoreAudioDriver.cpp index 892e492d..c84583b0 100644 --- a/macosx/JackCoreAudioDriver.cpp +++ b/macosx/JackCoreAudioDriver.cpp @@ -251,9 +251,6 @@ OSStatus JackCoreAudioDriver::DeviceNotificationCallback(AudioDeviceID inDevice, case kAudioDeviceProcessorOverload: JackLog("JackCoreAudioDriver::DeviceNotificationCallback kAudioDeviceProcessorOverload\n"); - #ifdef DEBUG - //driver->fLogFile->Capture(AudioGetCurrentHostTime() - AudioConvertNanosToHostTime(LOG_SAMPLE_DURATION * 1000000), AudioGetCurrentHostTime(), true, "Captured Latency Log for I/O Cycle Overload\n"); - #endif driver->NotifyXRun(GetMicroSeconds()); break; @@ -423,18 +420,10 @@ OSStatus JackCoreAudioDriver::GetTotalChannels(AudioDeviceID device, int* channe JackCoreAudioDriver::JackCoreAudioDriver(const char* name, JackEngine* engine, JackSynchro** table) : JackAudioDriver(name, engine, table), fJackInputData(NULL), fDriverOutputData(NULL), fState(false) -{ -#ifdef DEBUG - //fLogFile = new CALatencyLog("jackmp_latency", ".txt"); -#endif -} +{} JackCoreAudioDriver::~JackCoreAudioDriver() -{ -#ifdef DEBUG - //delete fLogFile; -#endif -} +{} int JackCoreAudioDriver::SetupDevices(const char* capture_driver_uid, const char* playback_driver_uid, char* capture_driver_name, char* playback_driver_name) { diff --git a/macosx/JackCoreAudioDriver.h b/macosx/JackCoreAudioDriver.h index 1ef37ade..cdcc2727 100644 --- a/macosx/JackCoreAudioDriver.h +++ b/macosx/JackCoreAudioDriver.h @@ -26,13 +26,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include "JackAudioDriver.h" #include "JackTime.h" -#include "/Developer/Examples/CoreAudio/PublicUtility/CALatencyLog.h" - namespace Jack { #define kVersion 102 -#define LOG_SAMPLE_DURATION 3 // in millisecond typedef UInt8 CAAudioHardwareDeviceSectionID; #define kAudioDeviceSectionInput ((CAAudioHardwareDeviceSectionID)0x01) @@ -51,11 +48,7 @@ class JackCoreAudioDriver : public JackAudioDriver private: - #ifdef DEBUG - //CALatencyLog* fLogFile; - #endif - - AudioUnit fAUHAL; + AudioUnit fAUHAL; AudioBufferList* fJackInputData; AudioBufferList* fDriverOutputData;