Changeset 56516 in vbox

Timestamp:

Jun 18, 2015 12:34:47 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

101136

Message:

Main: Save audio codec settings (see #7902).

Location:

trunk

Files:

• include/VBox/settings.h (modified) (3 diffs)
• src/VBox/Main/src-server/AudioAdapterImpl.cpp (modified) (3 diffs)
• src/VBox/Main/xml/Settings.cpp (modified) (2 diffs)

trunk/include/VBox/settings.h

@@ -696 +696 @@
         : fEnabled(true),
           controllerType(AudioControllerType_AC97),
+          codecType(AudioCodecType_STAC9700),
           driverType(AudioDriverType_Null)
     {}
@@ -704 +705 @@
                 || (    (fEnabled        == a.fEnabled)
                      && (controllerType  == a.controllerType)
+                     && (codecType       == a.codecType)
                      && (driverType      == a.driverType)
                      && (properties      == a.properties)
@@ -711 +713 @@
     bool                    fEnabled;
     AudioControllerType_T   controllerType;
+    AudioCodecType_T        codecType;
     AudioDriverType_T       driverType;
     settings::StringsMap properties;

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

@@ -33 +33 @@
         mEnabled(false),
         mAudioDriver(AudioDriverType_Null),
-        mAudioController(AudioControllerType_AC97)
+        mAudioController(AudioControllerType_AC97),
+        mAudioCodec(AudioCodecType_STAC9700)
     {}
 
@@ -507 +508 @@
     mData->m->mEnabled = data.fEnabled;
     mData->m->mAudioController = data.controllerType;
+    mData->m->mAudioCodec = data.codecType;
     mData->m->mAudioDriver = data.driverType;
 
@@ -535 +537 @@
     data.fEnabled = !!mData->m->mEnabled;
     data.controllerType = mData->m->mAudioController;
+    data.codecType = mData->m->mAudioCodec;
     data.driverType = mData->m->mAudioDriver;
 

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

@@ -2651 +2651 @@
     }
 
+    if (elmAudioAdapter.getAttributeValue("codec", strTemp))
+    {
+        if (strTemp == "SB16")
+            aa.codecType = AudioCodecType_SB16;
+        else if (strTemp == "STAC9700")
+            aa.codecType = AudioCodecType_STAC9700;
+        else if (strTemp == "AD1980")
+            aa.codecType = AudioCodecType_AD1980;
+        else if (strTemp == "STAC9221")
+            aa.codecType = AudioCodecType_STAC9221;
+        else
+            throw ConfigFileError(this, &elmAudioAdapter, N_("Invalid value '%s' in AudioAdapter/@codec attribute"), strTemp.c_str());
+    }
+    else
+    {
+        /* No codec attribute provided; use defaults. */
+        switch (aa.controllerType)
+        {
+            case AudioControllerType_AC97:
+                aa.codecType = AudioCodecType_STAC9700;
+                break;
+            case AudioControllerType_SB16:
+                aa.codecType = AudioCodecType_SB16;
+                break;
+            case AudioControllerType_HDA:
+                aa.codecType = AudioCodecType_STAC9221;
+                break;
+            default:
+                Assert(false);  /* We just checked the controller type above. */
+        }
+    }
+
     if (elmAudioAdapter.getAttributeValue("driver", strTemp))
     {
@@ -4716 +4748 @@
     }
     pelmAudio->setAttribute("controller", pcszController);
+
+    const char *pcszCodec;
+    switch (hw.audioAdapter.codecType)
+    {
+        /* Only write out the setting for non-default AC'97 codec
+         * and leave the rest alone.
+         */
+#if 0
+        case AudioCodecType_SB16:
+            pcszCodec = "SB16";
+            break;
+        case AudioCodecType_STAC9221:
+            pcszCodec = "STAC9221";
+            break;
+        case AudioCodecType_STAC9700:
+            pcszCodec = "STAC9700";
+            break;
+#endif
+        case AudioCodecType_AD1980:
+            pcszCodec = "AD1980";
+            break;
+        default:
+            /* Don't write out anything if unknown. */
+            pcszCodec = NULL;
+    }
+    if (pcszCodec)
+        pelmAudio->setAttribute("codec", pcszCodec);
 
     if (m->sv >= SettingsVersion_v1_10)