Changeset 22173 in vbox for trunk/src/VBox/Main/AudioAdapterImpl.cpp

Timestamp:

Aug 11, 2009 3:38:59 PM (16 years ago)

Author:

vboxsync

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

50951

Message:

Main: the big XML settings rework. Move XML reading/writing out of interface implementation code into separate layer so it can handle individual settings versions in the future.

File:

• trunk/src/VBox/Main/AudioAdapterImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/AudioAdapterImpl.cpp

@@ -361 +361 @@
  *  @note Locks this object for writing.
  */
-HRESULT AudioAdapter::loadSettings (const settings::Key &aMachineNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aMachineNode.isNull(), E_FAIL);
-
+HRESULT AudioAdapter::loadSettings(const settings::AudioAdapter &data)
+{
     AutoCaller autoCaller(this);
     AssertComRCReturnRC(autoCaller.rc());
@@ -383 +379 @@
      * default to B. */
 
-    /* AudioAdapter node (required) */
-    Key audioAdapterNode = aMachineNode.key ("AudioAdapter");
-
-    /* is the adapter enabled? (required) */
-    mData->mEnabled = audioAdapterNode.value <bool> ("enabled");
-
-    /* now check the audio adapter */
-    const char *controller = audioAdapterNode.stringValue ("controller");
-    if (strcmp (controller, "SB16") == 0)
-        mData->mAudioController = AudioControllerType_SB16;
-    else if (strcmp (controller, "AC97") == 0)
-        mData->mAudioController = AudioControllerType_AC97;
-
-    /* now check the audio driver (required) */
-    const char *driver = audioAdapterNode.stringValue ("driver");
-    if      (strcmp (driver, "Null") == 0)
-        mData->mAudioDriver = AudioDriverType_Null;
-#ifdef RT_OS_WINDOWS
-    else if (strcmp (driver, "WinMM") == 0)
-#ifdef VBOX_WITH_WINMM
-        mData->mAudioDriver = AudioDriverType_WinMM;
-#else
-        /* fall back to dsound */
-        mData->mAudioDriver = AudioDriverType_DirectSound;
-#endif
-    else if (strcmp (driver, "DirectSound") == 0)
-        mData->mAudioDriver = AudioDriverType_DirectSound;
-#endif // RT_OS_WINDOWS
-#ifdef RT_OS_SOLARIS
-    else if (strcmp (driver, "SolAudio") == 0)
-        mData->mAudioDriver = AudioDriverType_SolAudio;
-#endif // RT_OS_SOLARIS
-#ifdef RT_OS_LINUX
-    else if (strcmp (driver, "ALSA") == 0)
-# ifdef VBOX_WITH_ALSA
-        mData->mAudioDriver = AudioDriverType_ALSA;
-# else
-        /* fall back to OSS */
-        mData->mAudioDriver = AudioDriverType_OSS;
-# endif
-    else if (strcmp (driver, "Pulse") == 0)
-# ifdef VBOX_WITH_PULSE
-        mData->mAudioDriver = AudioDriverType_Pulse;
-# else
-        /* fall back to OSS */
-        mData->mAudioDriver = AudioDriverType_OSS;
-# endif
-#endif // RT_OS_LINUX
-#if defined (RT_OS_LINUX) || defined (RT_OS_FREEBSD) || defined(VBOX_WITH_SOLARIS_OSS)
-    else if (strcmp (driver, "OSS") == 0)
-        mData->mAudioDriver = AudioDriverType_OSS;
-#endif // RT_OS_LINUX || RT_OS_FREEBSD
-#ifdef RT_OS_DARWIN
-    else if (strcmp (driver, "CoreAudio") == 0)
-        mData->mAudioDriver = AudioDriverType_CoreAudio;
-#endif
-#ifdef RT_OS_OS2
-    else if (strcmp (driver, "MMPM") == 0)
-        mData->mAudioDriver = AudioDriverType_MMPM;
-#endif
-    else
-        AssertMsgFailed (("Invalid driver '%s'\n", driver));
+    mData->mEnabled = data.fEnabled;
+    mData->mAudioController = data.controllerType;
+    mData->mAudioDriver = data.driverType;
 
     return S_OK;
@@ -456 +393 @@
  *  @note Locks this object for reading.
  */
-HRESULT AudioAdapter::saveSettings (settings::Key &aMachineNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aMachineNode.isNull(), E_FAIL);
-
+HRESULT AudioAdapter::saveSettings(settings::AudioAdapter &data)
+{
     AutoCaller autoCaller(this);
     AssertComRCReturnRC(autoCaller.rc());
@@ -467 +400 @@
     AutoReadLock alock(this);
 
-    Key node = aMachineNode.createKey ("AudioAdapter");
-
-    const char *controllerStr = NULL;
-    switch (mData->mAudioController)
-    {
-        case AudioControllerType_SB16:
-        {
-            controllerStr = "SB16";
-            break;
-        }
-        default:
-        {
-            controllerStr = "AC97";
-            break;
-        }
-    }
-    node.setStringValue ("controller", controllerStr);
-
-    const char *driverStr = NULL;
-    switch (mData->mAudioDriver)
-    {
-        case AudioDriverType_Null:
-        {
-            driverStr = "Null";
-            break;
-        }
-#ifdef RT_OS_WINDOWS
-            case AudioDriverType_WinMM:
-# ifdef VBOX_WITH_WINMM
-            {
-                driverStr = "WinMM";
-                break;
-            }
-# endif
-            case AudioDriverType_DirectSound:
-            {
-                driverStr = "DirectSound";
-                break;
-            }
-#endif /* RT_OS_WINDOWS */
-#ifdef RT_OS_SOLARIS
-            case AudioDriverType_SolAudio:
-            {
-                driverStr = "SolAudio";
-                break;
-            }
-#endif
-#ifdef RT_OS_LINUX
-            case AudioDriverType_ALSA:
-# ifdef VBOX_WITH_ALSA
-            {
-                driverStr = "ALSA";
-                break;
-            }
-# endif
-            case AudioDriverType_Pulse:
-# ifdef VBOX_WITH_PULSE
-            {
-                driverStr = "Pulse";
-                break;
-            }
-# endif
-#endif /* RT_OS_LINUX */
-#if defined (RT_OS_LINUX) || defined (RT_OS_FREEBSD) || defined(VBOX_WITH_SOLARIS_OSS)
-            case AudioDriverType_OSS:
-            {
-                driverStr = "OSS";
-                break;
-            }
-#endif /* RT_OS_LINUX || RT_OS_FREEBSD */
-#ifdef RT_OS_DARWIN
-            case AudioDriverType_CoreAudio:
-            {
-                driverStr = "CoreAudio";
-                break;
-            }
-#endif
-#ifdef RT_OS_OS2
-            case AudioDriverType_MMPM:
-            {
-                driverStr = "MMPM";
-                break;
-            }
-#endif
-            default:
-                ComAssertMsgFailedRet (("Wrong audio driver type! driver = %d",
-                                        mData->mAudioDriver),
-                                       E_FAIL);
-    }
-    node.setStringValue ("driver", driverStr);
-
-    node.setValue <bool> ("enabled", !!mData->mEnabled);
-
+    data.fEnabled = mData->mEnabled;
+    data.controllerType = mData->mAudioController;
+    data.driverType = mData->mAudioDriver;
     return S_OK;
 }