diff --git a/ChangeLog b/ChangeLog index eddf552e..017f65dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,10 @@ Adrian Knoth Jackdmp changes log --------------------------- +2010-08-25 Stephane Letz + + * In JackCoreAudioDriver, fix an issue when no value is given for input. + 2010-08-23 Stephane Letz * Adrian Knoth fix for linux cycle.h (ticket 188). diff --git a/macosx/Jackdmp.xcodeproj/project.pbxproj b/macosx/Jackdmp.xcodeproj/project.pbxproj index 76be4b96..4aa25a29 100644 --- a/macosx/Jackdmp.xcodeproj/project.pbxproj +++ b/macosx/Jackdmp.xcodeproj/project.pbxproj @@ -5642,7 +5642,14 @@ isa = PBXProject; buildConfigurationList = 4B699DD5097D427F00A18468 /* Build configuration list for PBXProject "Jackdmp" */; compatibilityVersion = "Xcode 2.4"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); mainGroup = 08FB7794FE84155DC02AAC07 /* JackServer */; projectDirPath = ""; projectRoot = ""; diff --git a/macosx/coreaudio/JackCoreAudioDriver.cpp b/macosx/coreaudio/JackCoreAudioDriver.cpp index f1b62dc7..26d86988 100644 --- a/macosx/coreaudio/JackCoreAudioDriver.cpp +++ b/macosx/coreaudio/JackCoreAudioDriver.cpp @@ -1366,7 +1366,7 @@ int JackCoreAudioDriver::SetupBuffers(int inchannels) // Prepare buffers fJackInputData = (AudioBufferList*)malloc(sizeof(UInt32) + inchannels * sizeof(AudioBuffer)); fJackInputData->mNumberBuffers = inchannels; - for (int i = 0; i < fCaptureChannels; i++) { + for (int i = 0; i < inchannels; i++) { fJackInputData->mBuffers[i].mNumberChannels = 1; fJackInputData->mBuffers[i].mDataByteSize = fEngineControl->fBufferSize * sizeof(float); } @@ -1478,11 +1478,6 @@ int JackCoreAudioDriver::Open(jack_nframes_t buffer_size, char playback_driver_name[256]; // Keep initial state - fCapturing = capturing; - fPlaying = playing; - fInChannels = inchannels; - fOutChannels = outchannels; - fMonitor = monitor; strcpy(fCaptureUID, capture_driver_uid); strcpy(fPlaybackUID, playback_driver_uid); fCaptureLatency = capture_latency; @@ -1946,7 +1941,7 @@ extern "C" bool capture = false; bool playback = false; int chan_in = -1; // Default: if not explicitely set, then max possible will be used... - int chan_out = -1; // Default: ifà not explicitely set, then max possible will be used... + int chan_out = -1; // Default: if not explicitely set, then max possible will be used... bool monitor = false; const char* capture_driver_uid = ""; const char* playback_driver_uid = ""; diff --git a/macosx/coreaudio/JackCoreAudioDriver.h b/macosx/coreaudio/JackCoreAudioDriver.h index 9f827dfc..b0ccbe10 100644 --- a/macosx/coreaudio/JackCoreAudioDriver.h +++ b/macosx/coreaudio/JackCoreAudioDriver.h @@ -68,17 +68,9 @@ class JackCoreAudioDriver : public JackAudioDriver bool fState; bool fHogged; - // Initial state - bool fCapturing; - bool fPlaying; - - int fInChannels; - int fOutChannels; - char fCaptureUID[256]; char fPlaybackUID[256]; - bool fMonitor; float fIOUsage; float fComputationGrain; bool fClockDriftCompensate;