Changeset 63547 in vbox for trunk

Timestamp:

Aug 16, 2016 12:33:51 PM (8 years ago)

Author:

vboxsync

Message:

Audio/DrvHostCoreAudio.cpp: Removed USE_NON_DEPRECATED_APIS and use the current APIs by default.

File:

• trunk/src/VBox/Devices/Audio/DrvHostCoreAudio.cpp (modified) (7 diffs)

trunk/src/VBox/Devices/Audio/DrvHostCoreAudio.cpp

@@ -275 +275 @@
 *   Defined Constants And Macros                                                                                                 *
 *********************************************************************************************************************************/
-/** @todo r=bird: The three API calls we use for finding, opening and closing
- * the default audio component are deprecated since 10.8.  This define switches
- * over to using the replacement/renamed APIs introduced in 10.6+ */
-#define USE_NON_DEPRECATED_APIS 1
-
 /** @name Initialization status indicator used for the recreation of the AudioUnits.
  * @{ */
@@ -1260 +1255 @@
 
         /* Try to find the default HAL output component. */
-#ifdef USE_NON_DEPRECATED_APIS
         AudioComponentDescription cd;
-#else
-        ComponentDescription cd;
-#endif
+
         RT_ZERO(cd);
         cd.componentType         = kAudioUnitType_Output;
         cd.componentSubType      = kAudioUnitSubType_HALOutput;
         cd.componentManufacturer = kAudioUnitManufacturer_Apple;
-#ifdef USE_NON_DEPRECATED_APIS
+
         AudioComponent cp = AudioComponentFindNext(NULL, &cd);
-#else
-        Component cp = FindNextComponent(NULL, &cd);
-#endif
         if (cp == 0)
         {
@@ -1281 +1270 @@
 
         /* Open the default HAL output component. */
-#ifdef USE_NON_DEPRECATED_APIS
         err = AudioComponentInstanceNew(cp, &pStreamIn->audioUnit);
-#else
-        err = OpenAComponent(cp, &pStreamIn->audioUnit);
-#endif
         if (err != noErr)
         {
@@ -1685 +1670 @@
 
         /* Try to find the default HAL output component. */
-#ifdef USE_NON_DEPRECATED_APIS
         AudioComponentDescription cd;
-#else
-        ComponentDescription cd;
-#endif
         RT_ZERO(cd);
+
         cd.componentType         = kAudioUnitType_Output;
         cd.componentSubType      = kAudioUnitSubType_HALOutput;
         cd.componentManufacturer = kAudioUnitManufacturer_Apple;
-#ifdef USE_NON_DEPRECATED_APIS
+
         AudioComponent cp = AudioComponentFindNext(NULL, &cd);
-#else
-        Component cp = FindNextComponent(NULL, &cd);
-#endif
         if (cp == 0)
         {
@@ -1706 +1685 @@
 
         /* Open the default HAL output component. */
-#ifdef USE_NON_DEPRECATED_APIS
         err = AudioComponentInstanceNew(cp, &pStreamOut->audioUnit);
-#else
-        err = OpenAComponent(cp, &pStreamOut->audioUnit);
-#endif
         if (err != noErr)
         {
@@ -2435 +2410 @@
         err = AudioUnitUninitialize(pStreamIn->audioUnit);
         if (err == noErr)
-#ifdef USE_NON_DEPRECATED_APIS
             err = AudioComponentInstanceDispose(pStreamIn->audioUnit);
-#else
-            err = CloseComponent(pStreamIn->audioUnit);
-#endif
 
         if (   err != noErr
@@ -2550 +2521 @@
         err = AudioUnitUninitialize(pStreamOut->audioUnit);
         if (err == noErr)
-#ifdef USE_NON_DEPRECATED_APIS
             err = AudioComponentInstanceDispose(pStreamOut->audioUnit);
-#else
-            err = CloseComponent(pStreamOut->audioUnit);
-#endif
 
         if (   err != noErr