Changeset 68537 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 28, 2017 1:50:35 PM (7 years ago)

Author:

vboxsync

Message:

xml/Settings.cpp: audio in/out enable, fix default handling to give backwards compatibility (everything enabled by default) and be paranoid for new VMs (everything disabled by default)
Main/AudioAdapter: since new VMs are created with old settings version, make sure that the paranoid defaults for audio in/out enable are applied

Location:

trunk/src/VBox/Main

Files:

• src-server/AudioAdapterImpl.cpp (modified) (1 diff)
• xml/Settings.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-server/AudioAdapterImpl.cpp

@@ -86 +86 @@
     mData.allocate();
     mData->driverType = defaultAudioDriver;
+    mData->fEnabledIn = false;
+    mData->fEnabledOut = false;
 
     /* Confirm a successful initialization */

trunk/src/VBox/Main/xml/Settings.cpp

@@ -2547 +2547 @@
 AudioAdapter::AudioAdapter() :
     fEnabled(true), // default for old VMs, for new ones it's false
-    fEnabledIn(true),
-    fEnabledOut(true),
+    fEnabledIn(true), // default for old VMs, for new ones it's false
+    fEnabledOut(true), // default for old VMs, for new ones it's false
     controllerType(AudioControllerType_AC97),
     codecType(AudioCodecType_STAC9700),
@@ -2561 +2561 @@
 {
     return (sv < SettingsVersion_v1_16 ? false : !fEnabled)
-        && fEnabledIn == true
+        && (sv <= SettingsVersion_v1_16 ? fEnabledIn : !fEnabledIn)
+        && (sv <= SettingsVersion_v1_16 ? fEnabledOut : !fEnabledOut)
         && fEnabledOut == true
         && controllerType == AudioControllerType_AC97
@@ -3825 +3826 @@
         /* The new default is disabled, before it was enabled by default. */
         hw.audioAdapter.fEnabled = false;
+        /* The new default is disabled, before it was enabled by default. */
+        hw.audioAdapter.fEnabledIn = false;
+        /* The new default is disabled, before it was enabled by default. */
+        hw.audioAdapter.fEnabledOut = false;
     }
 
@@ -6039 +6044 @@
             pelmAudio->setAttribute("enabled", hw.audioAdapter.fEnabled);
 
-        if (!hw.audioAdapter.fEnabledIn)
+        if (   (m->sv <= SettingsVersion_v1_16 && !hw.audioAdapter.fEnabledIn)
+            || (m->sv > SettingsVersion_v1_16 && hw.audioAdapter.fEnabledIn))
             pelmAudio->setAttribute("enabledIn", hw.audioAdapter.fEnabledIn);
 
-        if (!hw.audioAdapter.fEnabledOut)
+        if (   (m->sv <= SettingsVersion_v1_16 && !hw.audioAdapter.fEnabledOut)
+            || (m->sv > SettingsVersion_v1_16 && hw.audioAdapter.fEnabledOut))
             pelmAudio->setAttribute("enabledOut", hw.audioAdapter.fEnabledOut);