From 6079d30e58dc47b7ee1f8754bdaaee4f67ea5bf7 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sun, 14 Aug 2016 16:20:24 -0400 Subject: [PATCH] =?UTF-8?q?Eliminated=20waiting=20here=20=E2=80=94=20eithe?= =?UTF-8?q?r=20the=20buffer=20can=20be=20enqueued=20now=20or=20it=20is=20d?= =?UTF-8?q?ropped.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OSBindings/Mac/Clock Signal/Audio/CSAudioQueue.m | 4 +--- OSBindings/Mac/Clock Signal/Documents/Vic20Document.swift | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/OSBindings/Mac/Clock Signal/Audio/CSAudioQueue.m b/OSBindings/Mac/Clock Signal/Audio/CSAudioQueue.m index 267ecee96..47507b332 100644 --- a/OSBindings/Mac/Clock Signal/Audio/CSAudioQueue.m +++ b/OSBindings/Mac/Clock Signal/Audio/CSAudioQueue.m @@ -174,9 +174,8 @@ static void audioOutputCallback( - (void)enqueueAudioBuffer:(const int16_t *)buffer numberOfSamples:(size_t)lengthInSamples { - while(1) + if([_writeLock tryLockWhenCondition:AudioQueueCanProceed]) { - [_writeLock lockWhenCondition:AudioQueueCanProceed]; if((_audioStreamReadPosition + _streamLength) - _audioStreamWritePosition >= lengthInSamples) { size_t samplesBeforeOverflow = _streamLength - (_audioStreamWritePosition % _streamLength); @@ -193,7 +192,6 @@ static void audioOutputCallback( _audioStreamWritePosition += lengthInSamples; [_writeLock unlockWithCondition:[self writeLockCondition]]; - break; } else { diff --git a/OSBindings/Mac/Clock Signal/Documents/Vic20Document.swift b/OSBindings/Mac/Clock Signal/Documents/Vic20Document.swift index ed113cc29..b55a42427 100644 --- a/OSBindings/Mac/Clock Signal/Documents/Vic20Document.swift +++ b/OSBindings/Mac/Clock Signal/Documents/Vic20Document.swift @@ -157,7 +157,7 @@ class Vic20Document: MachineDocument { standardUserDefaults.registerDefaults([ self.autoloadingUserDefaultsKey: true, self.memorySizeUserDefaultsKey: 5, - self.countryUserDefaultsKey: 4 + self.countryUserDefaultsKey: 1 ]) let loadAutomatically = standardUserDefaults.boolForKey(self.autoloadingUserDefaultsKey)