6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-10 00:29:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1441 from TomHarte/OSSGuardNoMacro

Browse Source 
Remove macros from CoreAudio handler.
This commit is contained in:
Thomas Harte 2025-01-03 23:38:35 -05:00 committed by GitHub
commit 114c2e2636
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
OSBindings/Mac/Clock Signal/Audio/CSAudioQueue.m
View File

@ -10,16 +10,17 @@
@import AudioToolbox; @import AudioToolbox;
#include <stdatomic.h> #include <stdatomic.h>
#define OSSGuard(x) { \ typedef OSStatus (^OSGuardable)(void);
const OSStatus status = x; \ static void OSSGuard(OSGuardable guardable) {
assert(!status); \ const OSStatus status = guardable();
(void)status; \ assert(!status);
(void)status;
} }
#define IsDry(x) (x) < 2 static BOOL IsDry(int x) { return x < 2; }
#define MaximumBacklog 4 static const int MaximumBacklog = 4;
#define NumBuffers (MaximumBacklog + 1) static const int NumBuffers = MaximumBacklog + 1;
@implementation CSAudioQueue { @implementation CSAudioQueue {
AudioQueueRef _audioQueue; AudioQueueRef _audioQueue;
@ -98,7 +99,7 @@
const int buffers = atomic_fetch_add(&queue->_enqueuedBuffers, -1) - 1; const int buffers = atomic_fetch_add(&queue->_enqueuedBuffers, -1) - 1;
if(!buffers) { if(!buffers) {
[queue->_queueLock lock]; [queue->_queueLock lock];
OSSGuard(AudioQueuePause(inAQ)); OSSGuard(^{return AudioQueuePause(inAQ);});
[queue->_queueLock unlock]; [queue->_queueLock unlock];
} }
@ -121,20 +122,20 @@
[_deallocLock lock]; [_deallocLock lock];
// Ensure no buffers remain enqueued by stopping the queue. // Ensure no buffers remain enqueued by stopping the queue.
if(_audioQueue) { if(_audioQueue) {
OSSGuard(AudioQueueStop(_audioQueue, true)); OSSGuard(^{return AudioQueueStop(self->_audioQueue, true);});
} }
// Free all buffers. // Free all buffers.
for(size_t c = 0; c < NumBuffers; c++) { for(size_t c = 0; c < NumBuffers; c++) {
if(_buffers[c]) { if(_buffers[c]) {
OSSGuard(AudioQueueFreeBuffer(_audioQueue, _buffers[c])); OSSGuard(^{return AudioQueueFreeBuffer(self->_audioQueue, self->_buffers[c]);});
_buffers[c] = NULL; _buffers[c] = NULL;
} }
} }
// Dispose of the queue. // Dispose of the queue.
if(_audioQueue) { if(_audioQueue) {
OSSGuard(AudioQueueDispose(_audioQueue, true)); OSSGuard(^{return AudioQueueDispose(self->_audioQueue, true);});
_audioQueue = NULL; _audioQueue = NULL;
} }
@ -155,10 +156,10 @@
const size_t bufferBytes = self.bufferSize * sizeof(int16_t) * _numChannels; const size_t bufferBytes = self.bufferSize * sizeof(int16_t) * _numChannels;
for(size_t c = 0; c < NumBuffers; c++) { for(size_t c = 0; c < NumBuffers; c++) {
if(_buffers[c]) { if(_buffers[c]) {
OSSGuard(AudioQueueFreeBuffer(_audioQueue, _buffers[c])); OSSGuard(^{return AudioQueueFreeBuffer(self->_audioQueue, self->_buffers[c]);});
} }
OSSGuard(AudioQueueAllocateBuffer(_audioQueue, (UInt32)bufferBytes, &_buffers[c])); OSSGuard(^{return AudioQueueAllocateBuffer(self->_audioQueue, (UInt32)bufferBytes, &self->_buffers[c]);});
_buffers[c]->mAudioDataByteSize = (UInt32)bufferBytes; _buffers[c]->mAudioDataByteSize = (UInt32)bufferBytes;
} }
[_queueLock unlock]; [_queueLock unlock];
@ -179,12 +180,12 @@
memcpy(_buffers[targetBuffer]->mAudioData, buffer, bufferBytes); memcpy(_buffers[targetBuffer]->mAudioData, buffer, bufferBytes);
[_queueLock lock]; [_queueLock lock];
OSSGuard(AudioQueueEnqueueBuffer(_audioQueue, _buffers[targetBuffer], 0, NULL)); OSSGuard(^{return AudioQueueEnqueueBuffer(self->_audioQueue, self->_buffers[targetBuffer], 0, NULL);});
// Starting is a no-op if the queue is already playing, but it may not have been started // Starting is a no-op if the queue is already playing, but it may not have been started
// yet, or may have been paused due to a pipeline failure if the producer is running slowly. // yet, or may have been paused due to a pipeline failure if the producer is running slowly.
if(enqueuedBuffers > 1) { if(enqueuedBuffers > 1) {
OSSGuard(AudioQueueStart(_audioQueue, NULL)); OSSGuard(^{return AudioQueueStart(self->_audioQueue, NULL);});
} }
[_queueLock unlock]; [_queueLock unlock];
} }