Ticket #35081: osx_output_plugin.c.diff

src/output/osx_output_plugin.c

@@ -240 +240 @@
 {
         struct osx_output *oo = (struct osx_output *)ao;
 
-        ComponentDescription desc;
+        AudioComponentDescription desc;
         desc.componentType = kAudioUnitType_Output;
         desc.componentSubType = oo->component_subtype;
         desc.componentManufacturer = kAudioUnitManufacturer_Apple;
         desc.componentFlags = 0;
         desc.componentFlagsMask = 0;
 
-        Component comp = FindNextComponent(NULL, &desc);
+        AudioComponent comp = AudioComponentFindNext(NULL, &desc);
         if (comp == 0) {
                 g_set_error(error_r, osx_output_quark(), 0,
                             "Error finding OS X component");
                 return false;
         }
 
-        OSStatus status = OpenAComponent(comp, &oo->au);
+        OSStatus status = AudioComponentInstanceNew(comp, &oo->au);
         if (status != noErr) {
                 g_set_error(error_r, osx_output_quark(), status,
                             "Unable to open OS X component: %s",
@@ -263 +263 @@
         }
 
         if (!osx_output_set_device(oo, error_r)) {
-                CloseComponent(oo->au);
+                AudioComponentInstanceDispose(oo->au);
                 return false;
         }
 
@@ -277 +277 @@
                                      kAudioUnitScope_Input, 0,
                                      &callback, sizeof(callback));
         if (result != noErr) {
-                CloseComponent(oo->au);
+                AudioComponentInstanceDispose(oo->au);
                 g_set_error(error_r, osx_output_quark(), result,
                             "unable to set callback for OS X audio unit");
                 return false;
@@ -291 +291 @@
 {
         struct osx_output *oo = (struct osx_output *)ao;
 
-        CloseComponent(oo->au);
+        AudioComponentInstanceDispose(oo->au);
 }
 
 static void