Changeset 61497 in vbox

Timestamp:

Jun 6, 2016 3:02:40 PM (9 years ago)

Author:

vboxsync

Message:

Main/xml/Settings.cpp: more complete audio enable handling fix, should be now fully backwards compatible

Location:

trunk

Files:

• include/VBox/settings.h (modified) (1 diff)
• src/VBox/Main/xml/Settings.cpp (modified) (2 diffs)

trunk/include/VBox/settings.h

@@ -624 +624 @@
     AudioAdapter();
 
-    bool areDefaultSettings() const;
+    bool areDefaultSettings(SettingsVersion_T sv) const;
 
     bool operator==(const AudioAdapter &a) const;

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

@@ -2488 +2488 @@
  * Check if all settings have default values.
  */
-bool AudioAdapter::areDefaultSettings() const
-{
-    return !fEnabled
+bool AudioAdapter::areDefaultSettings(SettingsVersion_T sv) const
+{
+    return (sv <= SettingsVersion_v1_14 ? fEnabled : !fEnabled)
         && controllerType == AudioControllerType_AC97
         && codecType == AudioCodecType_STAC9700
@@ -5864 +5864 @@
     }
 
-    if (!hw.audioAdapter.areDefaultSettings())
+    if (!hw.audioAdapter.areDefaultSettings(m->sv))
     {
         xml::ElementNode *pelmAudio = pelmHardware->createChild("AudioAdapter");