Changeset 89580 in vbox for trunk/src/VBox/Main/include

Timestamp:

Jun 9, 2021 1:22:55 PM (4 years ago)

Author:

vboxsync

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

145018

Message:

Main: Try fix VRDP-input-always-disabled regression from r120203+r120206. bugref:7820 bugref:9890

Location:

trunk/src/VBox/Main/include

Files:

• AudioDriver.h (modified) (2 diffs)
• ConsoleImpl.h (modified) (1 diff)

trunk/src/VBox/Main/include/AudioDriver.h

@@ -34 +34 @@
 struct AudioDriverCfg
 {
-    AudioDriverCfg(Utf8Str a_strDev = "", unsigned a_uInst = 0, unsigned a_uLUN = 0, Utf8Str a_strName = "")
+    AudioDriverCfg(Utf8Str a_strDev = "", unsigned a_uInst = 0, unsigned a_uLUN = 0, Utf8Str a_strName = "",
+                   bool a_fEnabledIn = false, bool a_fEnabledOut = false)
         : strDev(a_strDev)
         , uInst(a_uInst)
         , uLUN(a_uLUN)
-        , strName(a_strName) { }
+        , strName(a_strName)
+        , fEnabledIn(a_fEnabledIn)
+        , fEnabledOut(a_fEnabledOut)
+    { }
 
     /** Copy assignment operator. */
     AudioDriverCfg& operator=(AudioDriverCfg const &a_rThat) RT_NOEXCEPT
     {
-        this->strDev  = a_rThat.strDev;
-        this->uInst   = a_rThat.uInst;
-        this->uLUN    = a_rThat.uLUN;
-        this->strName = a_rThat.strName;
+        this->strDev      = a_rThat.strDev;
+        this->uInst       = a_rThat.uInst;
+        this->uLUN        = a_rThat.uLUN;
+        this->strName     = a_rThat.strName;
+        this->fEnabledIn  = a_rThat.fEnabledIn;
+        this->fEnabledOut = a_rThat.fEnabledOut;
 
         return *this;
@@ -52 +58 @@
 
     /** The device name. */
-    Utf8Str              strDev;
+    Utf8Str             strDev;
     /** The device instance. */
-    unsigned             uInst;
+    unsigned            uInst;
     /** The LUN the driver is attached to.
      *  Set the UINT8_MAX if not attached. */
-    unsigned             uLUN;
+    unsigned            uLUN;
     /** The driver name. */
-    Utf8Str              strName;
+    Utf8Str             strName;
+    /** Whether input is enabled. */
+    bool                fEnabledIn;
+    /** Whether output is enabled. */
+    bool                fEnabledOut;
 };
 

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -674 +674 @@
 
     static DECLCALLBACK(int) i_configConstructor(PUVM pUVM, PVM pVM, void *pvConsole);
-    void i_configAudioDriver(IAudioAdapter *pAudioAdapter, IVirtualBox *pVirtualBox, IMachine *pMachine,
-                             PCFGMNODE pLUN, const char *pszDriverName);
+    void i_configAudioDriver(IVirtualBox *pVirtualBox, IMachine *pMachine, PCFGMNODE pLUN, const char *pszDriverName,
+                             bool fAudioEnabledIn, bool fAudioEnabledOut);
     int i_configConstructorInner(PUVM pUVM, PVM pVM, AutoWriteLock *pAlock);
     int i_configCfgmOverlay(PCFGMNODE pRoot, IVirtualBox *pVirtualBox, IMachine *pMachine);