Changeset 61888 in vbox

Timestamp:

Jun 27, 2016 8:32:31 AM (9 years ago)

Author:

vboxsync

Message:

Audio: Renamed PDMAUDIOMIXERCTL_VOLUME -> PDMAUDIOMIXERCTL_VOLUME_MASTER.

Location:

trunk

Files:

• include/VBox/vmm/pdmaudioifs.h (modified) (1 diff)
• src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (6 diffs)
• src/VBox/Devices/Audio/DevIchHda.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/DevIchHdaCodec.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -257 +257 @@
 {
     PDMAUDIOMIXERCTL_UNKNOWN = 0,
-    PDMAUDIOMIXERCTL_VOLUME,
+    PDMAUDIOMIXERCTL_VOLUME_MASTER,
     PDMAUDIOMIXERCTL_FRONT,
     PDMAUDIOMIXERCTL_CENTER_LFE,

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

@@ -1050 +1050 @@
         switch (enmMixerCtl)
         {
-            case PDMAUDIOMIXERCTL_VOLUME:
+            case PDMAUDIOMIXERCTL_VOLUME_MASTER:
                 rc = AudioMixerSetMasterVolume(pThis->pMixer,    &Vol);
                 break;
@@ -1182 +1182 @@
     ichac97RecordSelect(pThis, 0);
 
-    ichac97MixerSetVolume(pThis, AC97_Master_Volume_Mute,  PDMAUDIOMIXERCTL_VOLUME, 0x8000);
+    ichac97MixerSetVolume(pThis, AC97_Master_Volume_Mute,  PDMAUDIOMIXERCTL_VOLUME_MASTER, 0x8000);
     ichac97MixerSetVolume(pThis, AC97_PCM_Out_Volume_Mute, PDMAUDIOMIXERCTL_FRONT,         0x8808);
     ichac97MixerSetVolume(pThis, AC97_Line_In_Volume_Mute, PDMAUDIOMIXERCTL_LINE_IN,       0x8808);
@@ -2022 +2022 @@
                             break; /* Register controls surround (rear), do nothing. */
                     }
-                    ichac97MixerSetVolume(pThis, index, PDMAUDIOMIXERCTL_VOLUME, u32Val);
+                    ichac97MixerSetVolume(pThis, index, PDMAUDIOMIXERCTL_VOLUME_MASTER, u32Val);
                     break;
                 case AC97_Headphone_Volume_Mute:
@@ -2030 +2030 @@
                         {
                             /* Register controls PCM (front) outputs. */
-                            ichac97MixerSetVolume(pThis, index, PDMAUDIOMIXERCTL_VOLUME, u32Val);
+                            ichac97MixerSetVolume(pThis, index, PDMAUDIOMIXERCTL_VOLUME_MASTER, u32Val);
                         }
                     }
@@ -2272 +2272 @@
     ichac97RecordSelect(pThis, ichac97MixerGet(pThis, AC97_Record_Select));
 # define V_(a, b) ichac97MixerSetVolume(pThis, a, b, ichac97MixerGet(pThis, a))
-    V_(AC97_Master_Volume_Mute,  PDMAUDIOMIXERCTL_VOLUME);
+    V_(AC97_Master_Volume_Mute,  PDMAUDIOMIXERCTL_VOLUME_MASTER);
     V_(AC97_PCM_Out_Volume_Mute, PDMAUDIOMIXERCTL_FRONT);
     V_(AC97_Line_In_Volume_Mute, PDMAUDIOMIXERCTL_LINE_IN);
@@ -2279 +2279 @@
     if (pThis->uCodecModel == Codec_AD1980)
         if (ichac97MixerGet(pThis, AC97_AD_Misc) & AD_MISC_HPSEL)
-            ichac97MixerSetVolume(pThis, AC97_Headphone_Volume_Mute, PDMAUDIOMIXERCTL_VOLUME,
+            ichac97MixerSetVolume(pThis, AC97_Headphone_Volume_Mute, PDMAUDIOMIXERCTL_VOLUME_MASTER,
                              ichac97MixerGet(pThis, AC97_Headphone_Volume_Mute));
 

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

@@ -3725 +3725 @@
     switch (enmMixerCtl)
     {
-        case PDMAUDIOMIXERCTL_VOLUME:
+        case PDMAUDIOMIXERCTL_VOLUME_MASTER:
             /* Fall through is intentional. */
         case PDMAUDIOMIXERCTL_FRONT:

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

@@ -1539 +1539 @@
     switch (enmMixerCtl)
     {
-        case PDMAUDIOMIXERCTL_VOLUME:
+        case PDMAUDIOMIXERCTL_VOLUME_MASTER:
         case PDMAUDIOMIXERCTL_FRONT:
             iDir = AMPLIFIER_OUT;
@@ -3010 +3010 @@
     switch (enmMixerCtl)
     {
-        case PDMAUDIOMIXERCTL_VOLUME:
+        case PDMAUDIOMIXERCTL_VOLUME_MASTER:
         case PDMAUDIOMIXERCTL_FRONT:
 #ifdef VBOX_WITH_HDA_51_SURROUND