Changeset 68489 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 21, 2017 2:17:01 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7820: Allow to enable/disable audio output/input through VM settings Audio page.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsAudio.cpp (modified) (7 diffs)
• UIMachineSettingsAudio.ui (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.cpp

@@ -39 +39 @@
         , m_audioDriverType(KAudioDriverType_Null)
         , m_audioControllerType(KAudioControllerType_AC97)
+        , m_fAudioOutputEnabled(false)
+        , m_fAudioInputEnabled(false)
     {}
 
@@ -48 +50 @@
                && (m_audioDriverType == other.m_audioDriverType)
                && (m_audioControllerType == other.m_audioControllerType)
+               && (m_fAudioOutputEnabled == other.m_fAudioOutputEnabled)
+               && (m_fAudioInputEnabled == other.m_fAudioInputEnabled)
                ;
     }
@@ -62 +66 @@
     /** Holds the audio controller type. */
     KAudioControllerType  m_audioControllerType;
+    /** Holds whether the audio output is enabled. */
+    bool                  m_fAudioOutputEnabled;
+    /** Holds whether the audio input is enabled. */
+    bool                  m_fAudioInputEnabled;
 };
 
@@ -102 +110 @@
         oldAudioData.m_audioDriverType = comAdapter.GetAudioDriver();
         oldAudioData.m_audioControllerType = comAdapter.GetAudioController();
+        oldAudioData.m_fAudioOutputEnabled = comAdapter.GetEnabledOut();
+        oldAudioData.m_fAudioInputEnabled = comAdapter.GetEnabledIn();
     }
 
@@ -120 +130 @@
     m_pComboAudioDriver->setCurrentIndex(m_pComboAudioDriver->findData((int)oldAudioData.m_audioDriverType));
     m_pComboAudioController->setCurrentIndex(m_pComboAudioController->findData((int)oldAudioData.m_audioControllerType));
+    m_pCheckBoxAudioOutput->setChecked(oldAudioData.m_fAudioOutputEnabled);
+    m_pCheckBoxAudioInput->setChecked(oldAudioData.m_fAudioInputEnabled);
 
     /* Polish page finally: */
@@ -134 +146 @@
     newAudioData.m_audioDriverType = static_cast<KAudioDriverType>(m_pComboAudioDriver->itemData(m_pComboAudioDriver->currentIndex()).toInt());
     newAudioData.m_audioControllerType = static_cast<KAudioControllerType>(m_pComboAudioController->itemData(m_pComboAudioController->currentIndex()).toInt());
+    newAudioData.m_fAudioOutputEnabled = m_pCheckBoxAudioOutput->isChecked();
+    newAudioData.m_fAudioInputEnabled = m_pCheckBoxAudioInput->isChecked();
 
     /* Cache new audio data: */
@@ -294 +308 @@
                 fSuccess = comAdapter.isOk();
             }
+            /* Save whether audio output is enabled: */
+            if (fSuccess && isMachineOffline() && newAudioData.m_fAudioOutputEnabled != oldAudioData.m_fAudioOutputEnabled)
+            {
+                comAdapter.SetEnabledOut(newAudioData.m_fAudioOutputEnabled);
+                fSuccess = comAdapter.isOk();
+            }
+            /* Save whether audio input is enabled: */
+            if (fSuccess && isMachineOffline() && newAudioData.m_fAudioInputEnabled != oldAudioData.m_fAudioInputEnabled)
+            {
+                comAdapter.SetEnabledIn(newAudioData.m_fAudioInputEnabled);
+                fSuccess = comAdapter.isOk();
+            }
 
             /* Show error message if necessary: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.ui

@@ -103 +103 @@
           </widget>
          </item>
+         <item row="2" column="0">
+          <widget class="QLabel" name="m_pLabelAudioExtended">
+           <property name="text">
+            <string>Extended Features:</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1">
+          <widget class="QCheckBox" name="m_pCheckBoxAudioOutput">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+             <horstretch>1</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="whatsThis">
+            <string>When checked, a virtual PCI audio card output will be enabled.</string>
+           </property>
+           <property name="text">
+            <string>Enable Audio &amp;Output</string>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="1">
+          <widget class="QCheckBox" name="m_pCheckBoxAudioInput">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+             <horstretch>1</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="whatsThis">
+            <string>When checked, a virtual PCI audio card input will be enabled.</string>
+           </property>
+           <property name="text">
+            <string>Enable Audio &amp;Input</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </widget>