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

Timestamp:

Feb 28, 2008 6:43:08 PM (17 years ago)

Author:

vboxsync

Message:

Main: Reworked enums to avoid 1) weird duplication of enum name when referring to enum values in cross-platform code; 2) possible clashes on Win32 due to putting identifiers like Paused or Disabled to the global namespace (via C enums). In the new style, enums are used like this: a) USBDeviceState_T v = USBDeviceState_Busy from cross-platform non-Qt code; b) KUSBDeviceState v = KUSBDeviceState_Busy from Qt code; c) USBDeviceState v = USBDeviceState_Busy from plain Win32 and d) PRUInt32 USBDeviceState v = USBDeviceState::Busy from plain XPCOM.

File:

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

trunk/src/VBox/Main/AudioAdapterImpl.cpp

@@ -225 +225 @@
         switch (aAudioDriver)
         {
-            case AudioDriverType_NullAudioDriver:
+            case AudioDriverType_Null:
 #ifdef RT_OS_WINDOWS
 # ifdef VBOX_WITH_WINMM
-            case AudioDriverType_WINMMAudioDriver:
-# endif
-            case AudioDriverType_DSOUNDAudioDriver:
+            case AudioDriverType_WINMM:
+# endif
+            case AudioDriverType_DSOUND:
 #endif /* RT_OS_WINDOWS */
 #ifdef RT_OS_LINUX
-            case AudioDriverType_OSSAudioDriver:
+            case AudioDriverType_OSS:
 # ifdef VBOX_WITH_ALSA
-            case AudioDriverType_ALSAAudioDriver:
+            case AudioDriverType_ALSA:
 # endif
 # ifdef VBOX_WITH_PULSE
-            case AudioDriverType_PulseAudioDriver:
+            case AudioDriverType_Pulse:
 # endif
 #endif /* RT_OS_LINUX */
 #ifdef RT_OS_DARWIN
-            case AudioDriverType_CoreAudioDriver:
-#endif 
+            case AudioDriverType_Core:
+#endif
 #ifdef RT_OS_OS2
-            case AudioDriverType_MMPMAudioDriver:
-#endif 
+            case AudioDriverType_MMPM:
+#endif
             {
                 mData.backup();
@@ -324 +324 @@
 /////////////////////////////////////////////////////////////////////////////
 
-/** 
+/**
  *  Loads settings from the given machine node.
  *  May be called once right after this object creation.
- * 
+ *
  *  @param aMachineNode <Machine> node.
- * 
- *  @note Locks this object for writing. 
+ *
+ *  @note Locks this object for writing.
  */
 HRESULT AudioAdapter::loadSettings (const settings::Key &aMachineNode)
@@ -352 +352 @@
      * place when a setting of a newly created object must default to A while
      * the same setting of an object loaded from the old settings file must
-     * default to B. */ 
+     * default to B. */
 
     /* AudioAdapter node (required) */
@@ -369 +369 @@
     /* now check the audio driver (required) */
     const char *driver = audioAdapterNode.stringValue ("driver");
-    mData->mAudioDriver = AudioDriverType_NullAudioDriver;
+    mData->mAudioDriver = AudioDriverType_Null;
     if      (strcmp (driver, "null") == 0)
         ; /* Null has been set above */
@@ -375 +375 @@
     else if (strcmp (driver, "winmm") == 0)
 #ifdef VBOX_WITH_WINMM
-        mData->mAudioDriver = AudioDriverType_WINMMAudioDriver;
+        mData->mAudioDriver = AudioDriverType_WINMM;
 #else
         /* fall back to dsound */
-        mData->mAudioDriver = AudioDriverType_DSOUNDAudioDriver;
+        mData->mAudioDriver = AudioDriverType_DSOUND;
 #endif
     else if (strcmp (driver, "dsound") == 0)
-        mData->mAudioDriver = AudioDriverType_DSOUNDAudioDriver;
+        mData->mAudioDriver = AudioDriverType_DSOUND;
 #endif // RT_OS_WINDOWS
 #ifdef RT_OS_LINUX
     else if (strcmp (driver, "oss") == 0)
-        mData->mAudioDriver = AudioDriverType_OSSAudioDriver;
+        mData->mAudioDriver = AudioDriverType_OSS;
     else if (strcmp (driver, "alsa") == 0)
 # ifdef VBOX_WITH_ALSA
-        mData->mAudioDriver = AudioDriverType_ALSAAudioDriver;
+        mData->mAudioDriver = AudioDriverType_ALSA;
 # else
         /* fall back to OSS */
-        mData->mAudioDriver = AudioDriverType_OSSAudioDriver;
+        mData->mAudioDriver = AudioDriverType_OSS;
 # endif
     else if (strcmp (driver, "pulse") == 0)
 # ifdef VBOX_WITH_PULSE
-        mData->mAudioDriver = AudioDriverType_PulseAudioDriver;
+        mData->mAudioDriver = AudioDriverType_Pulse;
 # else
         /* fall back to OSS */
-        mData->mAudioDriver = AudioDriverType_OSSAudioDriver;
+        mData->mAudioDriver = AudioDriverType_OSS;
 # endif
 #endif // RT_OS_LINUX
 #ifdef RT_OS_DARWIN
     else if (strcmp (driver, "coreaudio") == 0)
-        mData->mAudioDriver = AudioDriverType_CoreAudioDriver;
+        mData->mAudioDriver = AudioDriverType_Core;
 #endif
 #ifdef RT_OS_OS2
     else if (strcmp (driver, "mmpm") == 0)
-        mData->mAudioDriver = AudioDriverType_MMPMAudioDriver;
+        mData->mAudioDriver = AudioDriverType_MMPM;
 #endif
     else
@@ -415 +415 @@
 }
 
-/** 
+/**
  *  Saves settings to the given machine node.
- * 
+ *
  *  @param aMachineNode <Machine> node.
- * 
- *  @note Locks this object for reading. 
+ *
+ *  @note Locks this object for reading.
  */
 HRESULT AudioAdapter::saveSettings (settings::Key &aMachineNode)
@@ -454 +454 @@
     switch (mData->mAudioDriver)
     {
-        case AudioDriverType_NullAudioDriver:
+        case AudioDriverType_Null:
         {
             driverStr = "null";
@@ -460 +460 @@
         }
 #ifdef RT_OS_WINDOWS
-            case AudioDriverType_WINMMAudioDriver:
+            case AudioDriverType_WINMM:
 # ifdef VBOX_WITH_WINMM
             {
@@ -467 +467 @@
             }
 # endif
-            case AudioDriverType_DSOUNDAudioDriver:
+            case AudioDriverType_DSOUND:
             {
                 driverStr = "dsound";
@@ -474 +474 @@
 #endif /* RT_OS_WINDOWS */
 #ifdef RT_OS_LINUX
-            case AudioDriverType_ALSAAudioDriver:
+            case AudioDriverType_ALSA:
 # ifdef VBOX_WITH_ALSA
             {
@@ -481 +481 @@
             }
 # endif
-            case AudioDriverType_PulseAudioDriver:
+            case AudioDriverType_Pulse:
 # ifdef VBOX_WITH_PULSE
             {
@@ -488 +488 @@
             }
 # endif
-            case AudioDriverType_OSSAudioDriver:
+            case AudioDriverType_OSS:
             {
                 driverStr = "oss";
@@ -495 +495 @@
 #endif /* RT_OS_LINUX */
 #ifdef RT_OS_DARWIN
-            case AudioDriverType_CoreAudioDriver:
+            case AudioDriverType_Core:
             {
                 driverStr = "coreaudio";
@@ -502 +502 @@
 #endif
 #ifdef RT_OS_OS2
-            case AudioDriverType_MMPMAudioDriver:
+            case AudioDriverType_MMPM:
             {
                 driverStr = "mmpm";
@@ -520 +520 @@
 }
 
-/** 
+/**
  *  @note Locks this object for writing.
  */
@@ -544 +544 @@
 }
 
-/** 
+/**
  *  @note Locks this object for writing, together with the peer object (also
  *  for writing) if there is one.
@@ -572 +572 @@
 }
 
-/** 
+/**
  *  @note Locks this object for writing, together with the peer object
  *  represented by @a aThat (locked for reading).