vbox的更動 50686 路徑 trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

時間撮記:

2014-3-4 下午07:21:18 (11 年 以前)

作者:

vboxsync

訊息:

src/VBox/Devices/Audio, src/VBox/Main/src-client, include/VBox/vmm:

src/VBox/Devices/Audio: part of restructuring of audio code. Devices files correspondin to Hda, AC97 and SB16 audio. The structure of files have been modifed as per PDM specs. The modified code is under #ifdef VBOX_WITH_PDM_AUDIO_DRIVER

src/VBox/Main/src-client: Driver for the VRDE that interacts with DrvAudio. Enhancement of the CFGM tree for audio.

Config.kmk : addition of one configuration parameter that will control whether new audio code is disabled or enabled. "VBOX_WITH_PDM_AUDIO_DRIVER"

pdmaudioifs.h: common header file between Device , Intermediate audio driver and Backends specific to audio.

檔案:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (修改) (8 筆差異)

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

@@ -2503 +2503 @@
         attachStatusDriver(pInst, &mapSharedFolderLed, 0, 0, NULL, NULL, 0);
 
+#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
         /*
          * Audio Sniffer Device
@@ -2516 +2517 @@
         AudioSniffer *pAudioSniffer = mAudioSniffer;
         InsertConfigInteger(pCfg,  "Object", (uintptr_t)pAudioSniffer);
+#endif
 
         /*
@@ -2569 +2571 @@
             /* the Audio driver */
             InsertConfigNode(pInst,    "LUN#0", &pLunL0);
-            InsertConfigString(pLunL0, "Driver",               "AUDIO");
+            InsertConfigString(pLunL0, "Driver", "AUDIO");
+
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+            InsertConfigNode(pLunL0, "AttachedDriver", &pLunL1);
+            InsertConfigString(pLunL1, "Driver", "PulseAudio");
+#endif
+
             InsertConfigNode(pLunL0,   "Config", &pCfg);
 
@@ -2591 +2599 @@
                 case AudioDriverType_DirectSound:
                 {
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+                    InsertConfigString(pCfg, "AudioDriver", "DSoundAudio");
+#else
                     InsertConfigString(pCfg, "AudioDriver", "dsound");
+#endif
                     break;
                 }
@@ -2606 +2618 @@
                 case AudioDriverType_ALSA:
                 {
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+                    InsertConfigString(pCfg, "AudioDriver", "AlsaAudio");
+#else
                     InsertConfigString(pCfg, "AudioDriver", "alsa");
+#endif
                     break;
                 }
@@ -2613 +2629 @@
                 case AudioDriverType_Pulse:
                 {
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+                    InsertConfigString(pCfg, "AudioDriver", "PulseAudio");
+#else
                     InsertConfigString(pCfg, "AudioDriver", "pulse");
+#endif
                     break;
                 }
@@ -2629 +2649 @@
                 case AudioDriverType_Pulse:
                 {
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+                    InsertConfigString(pCfg, "AudioDriver", "PulseAudio");
+#else
                     InsertConfigString(pCfg, "AudioDriver", "pulse");
+#endif
                     break;
                 }
@@ -2644 +2668 @@
             hrc = pMachine->COMGETTER(Name)(bstr.asOutParam());                             H();
             InsertConfigString(pCfg, "StreamName", bstr);
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+            /* the Audio driver */
+            InsertConfigNode(pInst, "LUN#1", &pLunL0);
+            InsertConfigString(pLunL0, "Driver", "AUDIO");
+            InsertConfigNode(pLunL0, "AttachedDriver", &pLunL1);
+            InsertConfigString(pLunL1, "Driver", "AudioVRDE");
+            InsertConfigNode(pLunL0, "Config", &pCfg);
+            InsertConfigString(pCfg, "AudioDriver", "AudioVRDE");
+            InsertConfigString(pCfg, "StreamName", bstr);
+            InsertConfigNode(pLunL1, "Config", &pCfg);
+            InsertConfigInteger(pCfg,  "Object", (uintptr_t)mAudioVRDE);
+            InsertConfigInteger(pCfg,  "ObjectVRDPServer", (uintptr_t)mConsoleVRDPServer);
+
+#endif
         }