Changeset 82828 in vbox for trunk/src/VBox

Timestamp:

Jan 22, 2020 2:14:02 PM (5 years ago)

Author:

vboxsync

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

135797

Message:

FE/Qt: bugref:9611: UIAudioHostDriverEditor: Get rid of hardcoded audio driver types, instead acquire these types through CSystemProperties interface.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIAudioHostDriverEditor.cpp (modified) (6 diffs)
• UIAudioHostDriverEditor.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIAudioHostDriverEditor.cpp

@@ -23 +23 @@
 /* GUI includes: */
 #include "QIComboBox.h"
+#include "UICommon.h"
 #include "UIConverter.h"
 #include "UIAudioHostDriverEditor.h"
+
+/* COM includes: */
+#include "CSystemProperties.h"
 
 
@@ -30 +34 @@
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_fWithLabel(fWithLabel)
+    , m_enmValue(KAudioDriverType_Max)
     , m_pLabel(0)
     , m_pCombo(0)
@@ -40 +45 @@
     if (m_pCombo)
     {
-        int iIndex = m_pCombo->findData(QVariant::fromValue(enmValue));
+        /* Update cached value and
+         * combo if value has changed: */
+        if (m_enmValue != enmValue)
+        {
+            m_enmValue = enmValue;
+            populateCombo();
+        }
+
+        /* Look for proper index to choose: */
+        int iIndex = m_pCombo->findData(QVariant::fromValue(m_enmValue));
         if (iIndex != -1)
             m_pCombo->setCurrentIndex(iIndex);
@@ -48 +62 @@
 KAudioDriverType UIAudioHostDriverEditor::value() const
 {
-    return m_pCombo ? m_pCombo->itemData(m_pCombo->currentIndex()).value<KAudioDriverType>() : KAudioDriverType_Null;
+    return m_pCombo ? m_pCombo->currentData().value<KAudioDriverType>() : m_enmValue;
 }
 
@@ -95 +109 @@
             {
                 setFocusProxy(m_pCombo->focusProxy());
+                /* This is necessary since contents is dynamical now: */
+                m_pCombo->setSizeAdjustPolicy(QComboBox::AdjustToContents);
                 if (m_pLabel)
                     m_pLabel->setBuddy(m_pCombo->focusProxy());
@@ -119 +135 @@
 void UIAudioHostDriverEditor::populateCombo()
 {
-    /* Fill combo manually: */
-    m_pCombo->addItem(QString(), QVariant::fromValue(KAudioDriverType_Null));
-#ifdef Q_OS_WIN
-    m_pCombo->addItem(QString(), QVariant::fromValue(KAudioDriverType_DirectSound));
-# ifdef VBOX_WITH_WINMM
-    m_pCombo->addItem(QString(), QVariant::fromValue(KAudioDriverType_WinMM));
-# endif
-#endif
-#ifdef VBOX_WITH_AUDIO_OSS
-    m_pCombo->addItem(QString(), QVariant::fromValue(KAudioDriverType_OSS));
-#endif
-#ifdef VBOX_WITH_AUDIO_ALSA
-    m_pCombo->addItem(QString(), QVariant::fromValue(KAudioDriverType_ALSA));
-#endif
-#ifdef VBOX_WITH_AUDIO_PULSE
-    m_pCombo->addItem(QString(), QVariant::fromValue(KAudioDriverType_Pulse));
-#endif
-#ifdef Q_OS_MACX
-    m_pCombo->addItem(QString(), QVariant::fromValue(KAudioDriverType_CoreAudio));
-#endif
+    if (m_pCombo)
+    {
+        /* Clear combo first of all: */
+        m_pCombo->clear();
+
+        /* Load currently supported audio driver types: */
+        CSystemProperties comProperties = uiCommon().virtualBox().GetSystemProperties();
+        m_supportedValues = comProperties.GetSupportedAudioDriverTypes();
+
+        /* Make sure requested value if sane is present as well: */
+        if (   m_enmValue != KAudioDriverType_Max
+            && !m_supportedValues.contains(m_enmValue))
+            m_supportedValues.prepend(m_enmValue);
+
+        /* Update combo with all the supported values: */
+        foreach (const KAudioDriverType &enmType, m_supportedValues)
+            m_pCombo->addItem(QString(), QVariant::fromValue(enmType));
+
+        /* Retranslate finally: */
+        retranslateUi();
+    }
 }

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIAudioHostDriverEditor.h

@@ -57 +57 @@
     KAudioDriverType value() const;
 
+    /** Returns the vector of supported values. */
+    QVector<KAudioDriverType> supportedValues() const { return m_supportedValues; }
+
 protected:
 
@@ -77 +80 @@
     bool  m_fWithLabel;
 
+    /** Holds the value to be selected. */
+    KAudioDriverType  m_enmValue;
+
+    /** Holds the vector of supported values. */
+    QVector<KAudioDriverType>  m_supportedValues;
+
     /** Holds the label instance. */
     QLabel     *m_pLabel;