Changeset 68877 in vbox for trunk/src

Timestamp:

Sep 26, 2017 1:20:35 PM (8 years ago)

Author:

vboxsync

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

118138

Message:

FE/Qt: bugref:8720: VM settings: Display page: Video Capture tab: Record Audio check-box.

Location:

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

Files:

• UIMachineSettingsDisplay.cpp (modified) (9 diffs)
• UIMachineSettingsDisplay.ui (modified) (2 diffs)

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

@@ -65 +65 @@
         , m_iVideoCaptureFrameRate(0)
         , m_iVideoCaptureBitRate(0)
+        , m_strVideoCaptureOptions(QString())
     {}
 
@@ -94 +95 @@
                && (m_iVideoCaptureBitRate == other.m_iVideoCaptureBitRate)
                && (m_screens == other.m_screens)
+               && (m_strVideoCaptureOptions == other.m_strVideoCaptureOptions)
                ;
     }
@@ -101 +103 @@
     /** Returns whether the @a other passed data is different from this one. */
     bool operator!=(const UIDataSettingsMachineDisplay &other) const { return !equal(other); }
+
+    /** Video Capture Options. */
+    enum VideoCaptureOption
+    {
+        VideoCaptureOption_Unknown,
+        VideoCaptureOption_AC,
+    };
+
+    /** Returns enum value corresponding to passed @a strKey. */
+    static VideoCaptureOption toVideoCaptureOptionKey(const QString &strKey)
+    {
+        /* Compare case-sensitive: */
+        QMap<QString, VideoCaptureOption> keys;
+        keys["ac_enabled"] = VideoCaptureOption_AC;
+        /* Return known value or VideoCaptureOption_Unknown otherwise: */
+        return keys.value(strKey, VideoCaptureOption_Unknown);
+    }
+
+    /** Returns bool value corresponding to passed @a strValue. */
+    static bool toVideoCaptureOptionValue(const QString &strValue)
+    {
+        /* Compare case-sensitive: */
+        QMap<QString, bool> values;
+        values["true"] = true;
+        values["false"] = false;
+        /* Return known value or true otherwise: */
+        return values.value(strValue, true);
+    }
+
+    /** Returns string representation for passed enum @a enmKey. */
+    static QString fromVideoCaptureOptionKey(VideoCaptureOption enmKey)
+    {
+        /* Compare case-sensitive: */
+        QMap<VideoCaptureOption, QString> values;
+        values[VideoCaptureOption_AC] = "ac_enabled";
+        /* Return known value or QString() otherwise: */
+        return values.value(enmKey);
+    }
+
+    /** Returns string representation for passed bool @a fValue. */
+    static QString fromVideoCaptureOptionValue(bool fValue)
+    {
+        /* Compare case-sensitive: */
+        QMap<bool, QString> values;
+        values[true] = "true";
+        values[false] = "false";
+        /* Return known value or "true" otherwise: */
+        return values.value(fValue, "true");
+    }
+
+    /** Parses Video Capture Options. */
+    static void parseVideoCaptureOptions(const QString &strOptions,
+                                         QList<VideoCaptureOption> &outKeys,
+                                         QList<bool> &outValues)
+    {
+        outKeys.clear();
+        outValues.clear();
+        const QStringList aPairs = strOptions.split(',');
+        foreach (const QString &strPair, aPairs)
+        {
+            const QStringList aPair = strPair.split('=');
+            const VideoCaptureOption enmKey = toVideoCaptureOptionKey(aPair.value(0));
+            const bool fValue = toVideoCaptureOptionValue(aPair.value(1));
+            if (enmKey == VideoCaptureOption_Unknown)
+                continue;
+            outKeys << enmKey;
+            outValues << fValue;
+        }
+    }
+
+    /** Serializes Video Capture Options. */
+    static void serializeVideoCaptureOptions(const QList<VideoCaptureOption> &inKeys,
+                                             const QList<bool> &inValues,
+                                             QString &strOptions)
+    {
+        QStringList aPairs;
+        for (int i = 0; i < inKeys.size(); ++i)
+        {
+            QStringList aPair;
+            aPair << fromVideoCaptureOptionKey(inKeys.value(i));
+            aPair << fromVideoCaptureOptionValue(inValues.value(i));
+            aPairs << aPair.join('=');
+        }
+        strOptions = aPairs.join(',');
+    }
+
+    /** Returns whether passed Video Capture @a enmOption is enabled. */
+    static bool isVideoCaptureOptionEnabled(const QString &strOptions,
+                                            VideoCaptureOption enmOption)
+    {
+        QList<VideoCaptureOption> aKeys;
+        QList<bool> aValues;
+        parseVideoCaptureOptions(strOptions, aKeys, aValues);
+        int iIndex = aKeys.indexOf(enmOption);
+        if (iIndex == -1)
+            return true;
+        return aValues.value(iIndex);
+    }
+
+    /** Defines whether passed Video Capture @a enmOption is @a fEnabled. */
+    static QString setVideoCaptureOptionEnabled(const QString &strOptions,
+                                                VideoCaptureOption enmOption,
+                                                bool fEnabled)
+    {
+        QList<VideoCaptureOption> aKeys;
+        QList<bool> aValues;
+        parseVideoCaptureOptions(strOptions, aKeys, aValues);
+        int iIndex = aKeys.indexOf(enmOption);
+        if (iIndex == -1)
+        {
+            aKeys << enmOption;
+            aValues << fEnabled;
+        }
+        else
+        {
+            aValues[iIndex] = fEnabled;
+        }
+        QString strResult;
+        serializeVideoCaptureOptions(aKeys, aValues, strResult);
+        return strResult;
+    }
 
     /** Holds the video RAM amount. */
@@ -148 +271 @@
     /** Holds which of the guest screens should be captured. */
     QVector<BOOL> m_screens;
+    /** Holds the video capture options. */
+    QString m_strVideoCaptureOptions;
 };
 
@@ -258 +383 @@
     oldDisplayData.m_iVideoCaptureBitRate = m_machine.GetVideoCaptureRate();
     oldDisplayData.m_screens = m_machine.GetVideoCaptureScreens();
+    oldDisplayData.m_strVideoCaptureOptions = m_machine.GetVideoCaptureOptions();
 
     /* Gather other old display data: */
@@ -307 +433 @@
     m_pEditorVideoCaptureBitRate->setValue(oldDisplayData.m_iVideoCaptureBitRate);
     m_pScrollerVideoCaptureScreens->setValue(oldDisplayData.m_screens);
+    m_pCheckBoxVideoCaptureWithAudio->setChecked(UIDataSettingsMachineDisplay::isVideoCaptureOptionEnabled(oldDisplayData.m_strVideoCaptureOptions,
+                                                                                                           UIDataSettingsMachineDisplay::VideoCaptureOption_AC));
 
     /* Polish page finally: */
@@ -353 +481 @@
     newDisplayData.m_iVideoCaptureBitRate = m_pEditorVideoCaptureBitRate->value();
     newDisplayData.m_screens = m_pScrollerVideoCaptureScreens->value();
+    newDisplayData.m_strVideoCaptureOptions = UIDataSettingsMachineDisplay::setVideoCaptureOptionEnabled(m_pCache->base().m_strVideoCaptureOptions,
+                                                                                                         UIDataSettingsMachineDisplay::VideoCaptureOption_AC,
+                                                                                                         m_pCheckBoxVideoCaptureWithAudio->isChecked());
 
     /* Cache new display data: */
@@ -706 +837 @@
     m_pContainerSliderVideoCaptureQuality->setEnabled(fIsVideoCaptureOptionsEnabled);
     m_pEditorVideoCaptureBitRate->setEnabled(fIsVideoCaptureOptionsEnabled);
+
+    m_pLabelVideoCaptureExtended->setEnabled(fIsVideoCaptureOptionsEnabled);
+    m_pCheckBoxVideoCaptureWithAudio->setEnabled(fIsVideoCaptureOptionsEnabled);
 
     m_pLabelVideoCaptureScreens->setEnabled(fIsVideoCaptureScreenOptionEnabled);
@@ -1481 +1615 @@
                 fSuccess = m_machine.isOk();
             }
+            /* Save video capture options: */
+            if (fSuccess && newDisplayData.m_strVideoCaptureOptions != oldDisplayData.m_strVideoCaptureOptions)
+            {
+                m_machine.SetVideoCaptureOptions(newDisplayData.m_strVideoCaptureOptions);
+                fSuccess = m_machine.isOk();
+            }
         }
 

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

@@ -674 +674 @@
              </item>
              <item row="7" column="0">
+              <widget class="QLabel" name="m_pLabelVideoCaptureExtended">
+               <property name="text">
+                <string>Extended Features:</string>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+               </property>
+              </widget>
+             </item>
+             <item row="7" column="1" colspan="3">
+              <widget class="QCheckBox" name="m_pCheckBoxVideoCaptureWithAudio">
+               <property name="whatsThis">
+                <string>When checked, VirtualBox will record the audio stream to video file as well.</string>
+               </property>
+               <property name="text">
+                <string>&amp;Record Audio</string>
+               </property>
+              </widget>
+             </item>
+             <item row="8" column="0">
               <widget class="QLabel" name="m_pLabelVideoCaptureScreens">
                <property name="text">
@@ -686 +706 @@
               </widget>
              </item>
-             <item row="7" column="1" colspan="3">
+             <item row="8" column="1" colspan="3">
               <widget class="UIFilmContainer" name="m_pScrollerVideoCaptureScreens">
                <property name="whatsThis">