Changeset 56018 in vbox for trunk/src

Timestamp:

May 21, 2015 6:42:53 PM (10 years ago)

Author:

vboxsync

Message:

Audio/CoreAudio: Fix audio output if the default output device changes, before it would always stream to the output device being the default when the VM was started

File:

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

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

@@ -337 +337 @@
                                                                    void *pvUser)
 {
-    PCOREAUDIOSTREAMIN pStreamIn = (PCOREAUDIOSTREAMIN)pvUser;
-
     OSStatus err = noErr;
 
-    switch (propertyID)
-    {
-        case kAudioHardwarePropertyDefaultInputDevice:
-        {
-            /* This listener is called on every change of the hardware
-             * device. So check if the default device has really changed. */
-            AudioObjectPropertyAddress propAdr = { kAudioHardwarePropertyDefaultInputDevice,
-                                                   kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
-
-            UInt32 uSize = sizeof(pStreamIn->deviceID);
-            UInt32 uResp;
-            err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propAdr, 0, NULL, &uSize, &uResp);
-
-            if (err == noErr)
-            {
-                if (pStreamIn->deviceID != uResp)
+    LogFlowFunc(("propertyID=%u nAddresses=%u pvUser=%p\n", propertyID, nAddresses, pvUser));
+
+    for (UInt32 idxAddress = 0; idxAddress < nAddresses; idxAddress++)
+    {
+        const AudioObjectPropertyAddress *pProperty = &properties[idxAddress];
+
+        switch (pProperty->mSelector)
+        {
+            case kAudioHardwarePropertyDefaultInputDevice:
+            {
+                PCOREAUDIOSTREAMIN pStreamIn = (PCOREAUDIOSTREAMIN)pvUser;
+
+                /* This listener is called on every change of the hardware
+                 * device. So check if the default device has really changed. */
+                UInt32 uSize = sizeof(pStreamIn->deviceID);
+                UInt32 uResp;
+                err = AudioObjectGetPropertyData(kAudioObjectSystemObject, pProperty, 0, NULL, &uSize, &uResp);
+
+                if (err == noErr)
                 {
-                    LogRel(("CoreAudio: Default input device has changed\n"));
-
-                    /* We move the reinitialization to the next input event.
-                     * This make sure this thread isn't blocked and the
-                     * reinitialization is done when necessary only. */
-                    ASMAtomicXchgU32(&pStreamIn->status, CA_STATUS_REINIT);
+                    if (pStreamIn->deviceID != uResp)
+                    {
+                        LogRel(("CoreAudio: Default input device has changed\n"));
+
+                        /* We move the reinitialization to the next input event.
+                         * This make sure this thread isn't blocked and the
+                         * reinitialization is done when necessary only. */
+                        ASMAtomicXchgU32(&pStreamIn->status, CA_STATUS_REINIT);
+                    }
                 }
-            }
-            break;
-        }
-
-        default:
-            break;
+                break;
+            }
+
+            case kAudioHardwarePropertyDefaultOutputDevice:
+            {
+                PCOREAUDIOSTREAMOUT pStreamOut = (PCOREAUDIOSTREAMOUT)pvUser;
+
+                /* This listener is called on every change of the hardware
+                 * device. So check if the default device has really changed. */
+                AudioObjectPropertyAddress propAdr = { kAudioHardwarePropertyDefaultOutputDevice,
+                                                       kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
+
+                UInt32 uSize = sizeof(pStreamOut->deviceID);
+                UInt32 uResp;
+                err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propAdr, 0, NULL, &uSize, &uResp);
+
+                if (err == noErr)
+                {
+                    if (pStreamOut->deviceID != uResp)
+                    {
+                        LogRel(("CoreAudio: Default output device has changed\n"));
+
+                        /* We move the reinitialization to the next input event.
+                         * This make sure this thread isn't blocked and the
+                         * reinitialization is done when necessary only. */
+                        ASMAtomicXchgU32(&pStreamOut->status, CA_STATUS_REINIT);
+                    }
+                }
+                break;
+            }
+
+            default:
+                break;
+        }
     }
 
@@ -1708 +1740 @@
          * Unregister input device callbacks.
          */
-        AudioObjectPropertyAddress propAdr = { kAudioDeviceProcessorOverload, kAudioUnitScope_Global,
+        AudioObjectPropertyAddress propAdr = { kAudioDeviceProcessorOverload, kAudioObjectPropertyScopeGlobal,
                                                kAudioObjectPropertyElementMaster };
 #ifdef DEBUG
@@ -1806 +1838 @@
         if (pStreamOut->fDefDevChgListReg)
         {
-            AudioObjectPropertyAddress propAdr = { kAudioHardwarePropertyDefaultOutputDevice, kAudioUnitScope_Global,
+            AudioObjectPropertyAddress propAdr = { kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal,
                                                    kAudioObjectPropertyElementMaster };
             err = AudioObjectRemovePropertyListener(pStreamOut->deviceID, &propAdr,