Changeset 20260 in vbox

Timestamp:

Jun 4, 2009 10:12:12 AM (16 years ago)

Author:

vboxsync

Message:

Main: added default audio driver method to ISystemProperties

Location:

trunk/src/VBox/Main

Files:

• AudioAdapterImpl.cpp (modified) (2 diffs)
• SystemPropertiesImpl.cpp (modified) (3 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/SystemPropertiesImpl.h (modified) (2 diffs)

trunk/src/VBox/Main/AudioAdapterImpl.cpp

@@ -63 +63 @@
     AssertReturn (autoInitSpan.isOk(), E_FAIL);
 
+    /* Get the default audio driver out of the system properties */
+    ComPtr<IVirtualBox> VBox;
+    HRESULT rc = aParent->COMGETTER(Parent)(VBox.asOutParam());
+    if (FAILED(rc)) return rc;
+    ComPtr<ISystemProperties> sysProps;
+    rc = VBox->COMGETTER(SystemProperties)(sysProps.asOutParam());
+    if (FAILED(rc)) return rc;
+    AudioDriverType_T defaultAudioDriver;
+    rc = sysProps->COMGETTER(DefaultAudioDriver)(&defaultAudioDriver);
+    if (FAILED(rc)) return rc;
+
     unconst (mParent) = aParent;
     /* mPeer is left null */
 
     mData.allocate();
+    mData->mAudioDriver = defaultAudioDriver;
 
     /* Confirm a successful initialization */
@@ -339 +351 @@
     mEnabled = false;
     mAudioController = AudioControllerType_AC97;
-    /* Driver defaults which are OS specific */
-#if defined (RT_OS_WINDOWS)
-# ifdef VBOX_WITH_WINMM
-    mAudioDriver = AudioDriverType_WinMM;
-# else /* VBOX_WITH_WINMM */
-    mAudioDriver = AudioDriverType_DirectSound;
-# endif /* !VBOX_WITH_WINMM */
-#elif defined (RT_OS_SOLARIS)
-    mAudioDriver = AudioDriverType_SolAudio;
-#elif defined (RT_OS_LINUX)
-# if defined (VBOX_WITH_PULSE)
-    /* Check for the pulse library & that the pulse audio daemon is running. */
-    if (RTProcIsRunningByName ("pulseaudio") &&
-        RTLdrIsLoadable ("libpulse.so.0"))
-        mAudioDriver = AudioDriverType_Pulse;
-    else
-# endif /* VBOX_WITH_PULSE */
-# if defined (VBOX_WITH_ALSA)
-        /* Check if we can load the ALSA library */
-        if (RTLdrIsLoadable ("libasound.so.2"))
-            mAudioDriver = AudioDriverType_ALSA;
-        else
-# endif /* VBOX_WITH_ALSA */
-            mAudioDriver = AudioDriverType_OSS;
-#elif defined (RT_OS_DARWIN)
-    mAudioDriver = AudioDriverType_CoreAudio;
-#elif defined (RT_OS_OS2)
-    mAudioDriver = AudioDriverType_MMP;
-#elif defined (RT_OS_FREEBSD)
-    mAudioDriver = AudioDriverType_OSS;
-#else
+    /* Driver defaults to the null audio driver */
     mAudioDriver = AudioDriverType_Null;
-#endif
 }
 

trunk/src/VBox/Main/SystemPropertiesImpl.cpp

@@ -32 +32 @@
 #include <iprt/path.h>
 #include <iprt/dir.h>
+#include <iprt/process.h>
 
 #include <VBox/err.h>
@@ -113 +114 @@
     }
 
+    /* Driver defaults which are OS specific */
+#if defined (RT_OS_WINDOWS)
+# ifdef VBOX_WITH_WINMM
+    mDefaultAudioDriver = AudioDriverType_WinMM;
+# else /* VBOX_WITH_WINMM */
+    mDefaultAudioDriver = AudioDriverType_DirectSound;
+# endif /* !VBOX_WITH_WINMM */
+#elif defined (RT_OS_SOLARIS)
+    mDefaultAudioDriver = AudioDriverType_SolAudio;
+#elif defined (RT_OS_LINUX)
+# if defined (VBOX_WITH_PULSE)
+    /* Check for the pulse library & that the pulse audio daemon is running. */
+    if (RTProcIsRunningByName ("pulseaudio") &&
+        RTLdrIsLoadable ("libpulse.so.0"))
+        mDefaultAudioDriver = AudioDriverType_Pulse;
+    else
+# endif /* VBOX_WITH_PULSE */
+# if defined (VBOX_WITH_ALSA)
+        /* Check if we can load the ALSA library */
+        if (RTLdrIsLoadable ("libasound.so.2"))
+            mDefaultAudioDriver = AudioDriverType_ALSA;
+        else
+# endif /* VBOX_WITH_ALSA */
+            mDefaultAudioDriver = AudioDriverType_OSS;
+#elif defined (RT_OS_DARWIN)
+    mDefaultAudioDriver = AudioDriverType_CoreAudio;
+#elif defined (RT_OS_OS2)
+    mDefaultAudioDriver = AudioDriverType_MMP;
+#elif defined (RT_OS_FREEBSD)
+    mDefaultAudioDriver = AudioDriverType_OSS;
+#else
+    mDefaultAudioDriver = AudioDriverType_Null;
+#endif
+
     /* Confirm a successful initialization */
     if (SUCCEEDED (rc))
@@ -540 +575 @@
 }
 
+STDMETHODIMP SystemProperties::COMGETTER(DefaultAudioDriver) (AudioDriverType_T *aAudioDriver)
+{
+    if (!aAudioDriver)
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReadLock alock (this);
+
+    *aAudioDriver = mDefaultAudioDriver;
+
+    return S_OK;
+}
+
 // public methods only for internal purposes
 /////////////////////////////////////////////////////////////////////////////

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -7491 +7491 @@
      name="ISystemProperties"
      extends="$unknown"
-     uuid="0760e03f-06d0-481e-9f81-be43fef092ba"
+     uuid="63bfd184-df69-4949-9159-a923cf7b1207"
      wsmap="managed"
      >
@@ -7756 +7756 @@
         This value specifies how many old release log files are kept.
        </desc>
+    </attribute>
+
+    <attribute name="defaultAudioDriver" type="AudioDriverType" readonly="yes">
+      <desc>This value hold the default audio driver for the current
+      system.</desc>
     </attribute>
   </interface>

trunk/src/VBox/Main/include/SystemPropertiesImpl.h

@@ -93 +93 @@
     STDMETHOD(COMGETTER(LogHistoryCount)) (ULONG *count);
     STDMETHOD(COMSETTER(LogHistoryCount)) (ULONG count);
+    STDMETHOD(COMGETTER(DefaultAudioDriver)) (AudioDriverType_T *aAudioDriver);
 
     // public methods only for internal purposes
@@ -144 +145 @@
     BOOL mHWVirtExEnabled;
     ULONG mLogHistoryCount;
+    AudioDriverType_T mDefaultAudioDriver;
 };