Changeset 101199 in vbox for trunk/src/VBox

Timestamp:

Sep 20, 2023 2:14:08 PM (15 months ago)

Author:

vboxsync

Message:

Main + FE/Qt: More Virtio-Sound handling configuration. bugref:10384

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp (modified) (2 diffs)
• Main/src-client/ConsoleImpl.cpp (modified) (1 diff)
• Main/src-server/AudioAdapterImpl.cpp (modified) (2 diffs)
• Main/xml/Settings.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp

@@ -585 +585 @@
     switch (type)
     {
-        case KAudioControllerType_AC97: return QApplication::translate("UICommon", "ICH AC97", "AudioControllerType");
-        case KAudioControllerType_SB16: return QApplication::translate("UICommon", "SoundBlaster 16", "AudioControllerType");
-        case KAudioControllerType_HDA:  return QApplication::translate("UICommon", "Intel HD Audio", "AudioControllerType");
+        case KAudioControllerType_AC97:        return QApplication::translate("UICommon", "ICH AC97", "AudioControllerType");
+        case KAudioControllerType_SB16:        return QApplication::translate("UICommon", "SoundBlaster 16", "AudioControllerType");
+        case KAudioControllerType_HDA:         return QApplication::translate("UICommon", "Intel HD Audio", "AudioControllerType");
+        case KAudioControllerType_VirtioSound: return QApplication::translate("UICommon", "Virtio-Sound", "AudioControllerType");
         default: AssertMsgFailed(("No text for %d", type)); break;
     }
@@ -600 +601 @@
     list.insert(QApplication::translate("UICommon", "SoundBlaster 16", "AudioControllerType"), KAudioControllerType_SB16);
     list.insert(QApplication::translate("UICommon", "Intel HD Audio", "AudioControllerType"),  KAudioControllerType_HDA);
+    list.insert(QApplication::translate("UICommon", "Virtio-Sound", "AudioControllerType"),    KAudioControllerType_VirtioSound);
     if (!list.contains(strType))
     {

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -5291 +5291 @@
         switch (audioController)
         {
-            case AudioControllerType_HDA:  strDevice = "hda";     break;
-            case AudioControllerType_AC97: strDevice = "ichac97"; break;
-            case AudioControllerType_SB16: strDevice = "sb16";    break;
-            default:                                              break; /* None. */
+            case AudioControllerType_HDA:         strDevice = "hda";          break;
+            case AudioControllerType_AC97:        strDevice = "ichac97";      break;
+            case AudioControllerType_SB16:        strDevice = "sb16";         break;
+            case AudioControllerType_VirtioSound: strDevice = "virtio-sound"; break;
+            default:                                                          break; /* None. */
         }
     }

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

@@ -397 +397 @@
                 defaultCodec = AudioCodecType_STAC9221;
                 break;
+            case AudioControllerType_VirtioSound:
+                defaultCodec = AudioCodecType_Null;
+                break;
 
             default:
@@ -464 +467 @@
             if (aAudioCodec != AudioCodecType_STAC9221)
                 hrc = E_INVALIDARG;
+            break;
+        }
+
+        case AudioControllerType_VirtioSound:
+        {
+            hrc = E_NOTIMPL;
             break;
         }

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

@@ -5035 +5035 @@
         else if (strTemp == "HDA")
             aa.controllerType = AudioControllerType_HDA;
+        else if (strTemp == "Virtio-Sound")
+            aa.controllerType = AudioControllerType_VirtioSound;
         else
             throw ConfigFileError(this, &elmAudioAdapter, N_("Invalid value '%s' in AudioAdapter/@controller attribute"), strTemp.c_str());
@@ -5065 +5067 @@
             case AudioControllerType_HDA:
                 aa.codecType = AudioCodecType_STAC9221;
+                break;
+            case AudioControllerType_VirtioSound:
+                aa.codecType = AudioCodecType_Null;
                 break;
             default:
@@ -8067 +8072 @@
         xml::ElementNode *pelmAudio = pelmHardware->createChild("AudioAdapter");
 
-        const char *pcszController;
+        const char *pcszController = NULL;
         switch (hw.audioAdapter.controllerType)
         {
+            case AudioControllerType_VirtioSound:
+                if (m->sv >= SettingsVersion_v1_20)
+                {
+                    pcszController = "Virtio-Sound";
+                    break;
+                }
+                break;
             case AudioControllerType_SB16:
                 pcszController = "SB16";