Changeset 36924 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 3, 2011 7:39:41 AM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: 4989: UISettingsCache template integrated into Audio page.

Location:

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

Files:

• UIMachineSettingsAudio.cpp (modified) (4 diffs)
• UIMachineSettingsAudio.h (modified) (2 diffs)

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

@@ -36 +36 @@
     UISettingsPageMachine::fetchData(data);
 
-    /* Fill internal variables with corresponding values: */
-    const CAudioAdapter &audio = m_machine.GetAudioAdapter();
-    m_cache.m_fAudioEnabled = audio.GetEnabled();
-    m_cache.m_audioDriverType = audio.GetAudioDriver();
-    m_cache.m_audioControllerType = audio.GetAudioController();
+    /* Prepare audio data: */
+    UIDataSettingsMachineAudio audioData;
+
+    /* Check if adapter is valid: */
+    const CAudioAdapter &adapter = m_machine.GetAudioAdapter();
+    if (!adapter.isNull())
+    {
+        /* Gather audio data: */
+        audioData.m_fAudioEnabled = adapter.GetEnabled();
+        audioData.m_audioDriverType = adapter.GetAudioDriver();
+        audioData.m_audioControllerType = adapter.GetAudioController();
+    }
+
+    /* Cache audio data: */
+    m_cache.cacheInitialData(audioData);
 
     /* Upload machine to data: */
@@ -50 +60 @@
 void UIMachineSettingsAudio::getFromCache()
 {
-    /* Apply internal variables data to QWidget(s): */
-    mGbAudio->setChecked(m_cache.m_fAudioEnabled);
-    mCbAudioDriver->setCurrentIndex(mCbAudioDriver->findText(vboxGlobal().toString(m_cache.m_audioDriverType)));
-    mCbAudioController->setCurrentIndex(mCbAudioController->findText(vboxGlobal().toString(m_cache.m_audioControllerType)));
+    /* Get audio data from cache: */
+    const UIDataSettingsMachineAudio &audioData = m_cache.base();
+
+    /* Load audio data to page: */
+    mGbAudio->setChecked(audioData.m_fAudioEnabled);
+    mCbAudioDriver->setCurrentIndex(mCbAudioDriver->findText(vboxGlobal().toString(audioData.m_audioDriverType)));
+    mCbAudioController->setCurrentIndex(mCbAudioController->findText(vboxGlobal().toString(audioData.m_audioControllerType)));
 }
 
@@ -60 +73 @@
 void UIMachineSettingsAudio::putToCache()
 {
-    /* Gather internal variables data from QWidget(s): */
-    m_cache.m_fAudioEnabled = mGbAudio->isChecked();
-    m_cache.m_audioDriverType = vboxGlobal().toAudioDriverType(mCbAudioDriver->currentText());
-    m_cache.m_audioControllerType = vboxGlobal().toAudioControllerType(mCbAudioController->currentText());
+    /* Prepare audio data: */
+    UIDataSettingsMachineAudio audioData = m_cache.base();
+
+    /* Gather audio data: */
+    audioData.m_fAudioEnabled = mGbAudio->isChecked();
+    audioData.m_audioDriverType = vboxGlobal().toAudioDriverType(mCbAudioDriver->currentText());
+    audioData.m_audioControllerType = vboxGlobal().toAudioControllerType(mCbAudioController->currentText());
+
+    /* Cache audio data: */
+    m_cache.cacheCurrentData(audioData);
 }
 
@@ -73 +92 @@
     UISettingsPageMachine::fetchData(data);
 
-    if (isMachineOffline())
+    /* Check if audio data was changed: */
+    if (m_cache.wasChanged())
     {
-        CAudioAdapter audio = m_machine.GetAudioAdapter();
-        audio.SetEnabled(m_cache.m_fAudioEnabled);
-        audio.SetAudioDriver(m_cache.m_audioDriverType);
-        audio.SetAudioController(m_cache.m_audioControllerType);
+        /* Check if adapter still valid: */
+        CAudioAdapter adapter = m_machine.GetAudioAdapter();
+        if (!adapter.isNull())
+        {
+            /* Get audio data from cache: */
+            const UIDataSettingsMachineAudio &audioData = m_cache.data();
+
+            /* Store audio data: */
+            if (isMachineOffline())
+            {
+                adapter.SetEnabled(audioData.m_fAudioEnabled);
+                adapter.SetAudioDriver(audioData.m_audioDriverType);
+                adapter.SetAudioController(audioData.m_audioControllerType);
+            }
+        }
     }
 

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

@@ -24 +24 @@
 #include "COMDefs.h"
 
-/* Machine settings / Audio page / Cache: */
-struct UISettingsCacheMachineAudio
+/* Machine settings / Audio page / Data: */
+struct UIDataSettingsMachineAudio
 {
+    /* Default constructor: */
+    UIDataSettingsMachineAudio()
+        : m_fAudioEnabled(false)
+        , m_audioDriverType(KAudioDriverType_Null)
+        , m_audioControllerType(KAudioControllerType_AC97) {}
+    /* Functions: */
+    bool equal(const UIDataSettingsMachineAudio &other) const
+    {
+        return (m_fAudioEnabled == other.m_fAudioEnabled) &&
+               (m_audioDriverType == other.m_audioDriverType) &&
+               (m_audioControllerType == other.m_audioControllerType);
+    }
+    /* Operators: */
+    bool operator==(const UIDataSettingsMachineAudio &other) const { return equal(other); }
+    bool operator!=(const UIDataSettingsMachineAudio &other) const { return !equal(other); }
+    /* Variables: */
     bool m_fAudioEnabled;
     KAudioDriverType m_audioDriverType;
     KAudioControllerType m_audioControllerType;
 };
+typedef UISettingsCache<UIDataSettingsMachineAudio> UICacheSettingsMachineAudio;
 
 /* Machine settings / Audio page: */
@@ -69 +86 @@
 
     /* Cache: */
-    UISettingsCacheMachineAudio m_cache;
+    UICacheSettingsMachineAudio m_cache;
 };