From b7487e2ad2a6aa114e5c0570e2d78282caf58433 Mon Sep 17 00:00:00 2001
From: Christopher Snowhill <kode54@gmail.com>
Date: Mon, 23 Mar 2020 01:46:41 -0700
Subject: [PATCH] Clean up audio output code just a bit

---
 Audio/Output/OutputCoreAudio.h |  1 +
 Audio/Output/OutputCoreAudio.m | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Audio/Output/OutputCoreAudio.h b/Audio/Output/OutputCoreAudio.h
index 4169e58b7..636845cb5 100644
--- a/Audio/Output/OutputCoreAudio.h
+++ b/Audio/Output/OutputCoreAudio.h
@@ -6,6 +6,7 @@
 //  Copyright 2005 Vincent Spader. All rights reserved.
 //
 
+#import <AssertMacros.h>
 #import <Cocoa/Cocoa.h>
 
 #import <CoreAudio/AudioHardware.h>
diff --git a/Audio/Output/OutputCoreAudio.m b/Audio/Output/OutputCoreAudio.m
index 357beb204..8787e4d07 100644
--- a/Audio/Output/OutputCoreAudio.m
+++ b/Audio/Output/OutputCoreAudio.m
@@ -1,4 +1,4 @@
-    //
+//
 //  OutputCoreAudio.m
 //  Cog
 //
@@ -225,7 +225,7 @@ static OSStatus Sound_Renderer(void *inRefCon,  AudioUnitRenderActionFlags *ioAc
 	};
     UInt32 dataSize;
 	
-    ComponentDescription desc;
+    AudioComponentDescription desc;
 	OSStatus err;
 	
 	desc.componentType = kAudioUnitType_Output;
@@ -234,11 +234,11 @@ static OSStatus Sound_Renderer(void *inRefCon,  AudioUnitRenderActionFlags *ioAc
 	desc.componentFlags = 0;
 	desc.componentFlagsMask = 0;
 	
-	Component comp = FindNextComponent(NULL, &desc);  //Finds an component that meets the desc spec's
+	AudioComponent comp = AudioComponentFindNext(NULL, &desc);  //Finds an component that meets the desc spec's
 	if (comp == NULL)
 		return NO;
 	
-	err = OpenAComponent(comp, &outputUnit);  //gains access to the services provided by the component
+	err = AudioComponentInstanceNew(comp, &outputUnit);  //gains access to the services provided by the component
 	if (err)
 		return NO;
 	
@@ -344,7 +344,7 @@ static OSStatus Sound_Renderer(void *inRefCon,  AudioUnitRenderActionFlags *ioAc
 					deviceChannelMap[i] = i;
 			}
             
-			free(preferredChannelLayout), preferredChannelLayout = nil;
+            free(preferredChannelLayout); preferredChannelLayout = nil;
 		}
 		else {
 			// Just use a channel map that makes sense
@@ -415,7 +415,7 @@ static OSStatus Sound_Renderer(void *inRefCon,  AudioUnitRenderActionFlags *ioAc
 	{
         AudioOutputUnitStop(outputUnit);
 		AudioUnitUninitialize (outputUnit);
-		CloseComponent(outputUnit);
+		AudioComponentInstanceDispose(outputUnit);
 		outputUnit = NULL;
 	}
 }