Changeset 61528 in vbox for trunk/src/VBox

Timestamp:

Jun 7, 2016 10:13:48 AM (9 years ago)

Author:

vboxsync

Message:

Audio/DevIchAc97.cpp: Define SOFT_VOLUME not needed anymore.

File:

• trunk/src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Audio/DevIchAc97.cpp

@@ -63 +63 @@
 
 #define AC97_TIMER_HZ 50
-
-#ifdef VBOX
-# define SOFT_VOLUME /** @todo Get rid of this crap. */
-#else
-# define SOFT_VOLUME
-#endif
 
 /** @todo Use AC97_ prefixes! */
@@ -979 +973 @@
     int rc;
 
-#ifdef SOFT_VOLUME
     if (pThis->pMixer) /* Device can be in reset state, so no mixer available. */
     {
@@ -1007 +1000 @@
     }
     else
-        rc = VERR_NOT_SUPPORTED;
-
-    if (RT_FAILURE(rc))
-        return rc;
-#else
-    rc = VINF_SUCCESS;
-#endif /* SOFT_VOLUME */
+        rc = VINF_SUCCESS;
 
     rvol = VOL_MASK - ((VOL_MASK * rvol) / 255);
@@ -1032 +1019 @@
 
     ichac97MixerSet(pThis, index, val);
+
+    if (RT_FAILURE(rc))
+        LogFlowFunc(("Failed with %Rrc\n", rc));
 
     return rc;