Index: /trunk/include/VBox/vmm/pdmaudioifs.h
===================================================================
--- /trunk/include/VBox/vmm/pdmaudioifs.h	(revision 61887)
+++ /trunk/include/VBox/vmm/pdmaudioifs.h	(revision 61888)
@@ -257,5 +257,5 @@
 {
     PDMAUDIOMIXERCTL_UNKNOWN = 0,
-    PDMAUDIOMIXERCTL_VOLUME,
+    PDMAUDIOMIXERCTL_VOLUME_MASTER,
     PDMAUDIOMIXERCTL_FRONT,
     PDMAUDIOMIXERCTL_CENTER_LFE,
Index: /trunk/src/VBox/Devices/Audio/DevIchAc97.cpp
===================================================================
--- /trunk/src/VBox/Devices/Audio/DevIchAc97.cpp	(revision 61887)
+++ /trunk/src/VBox/Devices/Audio/DevIchAc97.cpp	(revision 61888)
@@ -1050,5 +1050,5 @@
         switch (enmMixerCtl)
         {
-            case PDMAUDIOMIXERCTL_VOLUME:
+            case PDMAUDIOMIXERCTL_VOLUME_MASTER:
                 rc = AudioMixerSetMasterVolume(pThis->pMixer,    &Vol);
                 break;
@@ -1182,5 +1182,5 @@
     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,5 +2022,5 @@
                             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,5 +2030,5 @@
                         {
                             /* Register controls PCM (front) outputs. */
-                            ichac97MixerSetVolume(pThis, index, PDMAUDIOMIXERCTL_VOLUME, u32Val);
+                            ichac97MixerSetVolume(pThis, index, PDMAUDIOMIXERCTL_VOLUME_MASTER, u32Val);
                         }
                     }
@@ -2272,5 +2272,5 @@
     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,5 +2279,5 @@
     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));
 
Index: /trunk/src/VBox/Devices/Audio/DevIchHda.cpp
===================================================================
--- /trunk/src/VBox/Devices/Audio/DevIchHda.cpp	(revision 61887)
+++ /trunk/src/VBox/Devices/Audio/DevIchHda.cpp	(revision 61888)
@@ -3725,5 +3725,5 @@
     switch (enmMixerCtl)
     {
-        case PDMAUDIOMIXERCTL_VOLUME:
+        case PDMAUDIOMIXERCTL_VOLUME_MASTER:
             /* Fall through is intentional. */
         case PDMAUDIOMIXERCTL_FRONT:
Index: /trunk/src/VBox/Devices/Audio/DevIchHdaCodec.cpp
===================================================================
--- /trunk/src/VBox/Devices/Audio/DevIchHdaCodec.cpp	(revision 61887)
+++ /trunk/src/VBox/Devices/Audio/DevIchHdaCodec.cpp	(revision 61888)
@@ -1539,5 +1539,5 @@
     switch (enmMixerCtl)
     {
-        case PDMAUDIOMIXERCTL_VOLUME:
+        case PDMAUDIOMIXERCTL_VOLUME_MASTER:
         case PDMAUDIOMIXERCTL_FRONT:
             iDir = AMPLIFIER_OUT;
@@ -3010,5 +3010,5 @@
     switch (enmMixerCtl)
     {
-        case PDMAUDIOMIXERCTL_VOLUME:
+        case PDMAUDIOMIXERCTL_VOLUME_MASTER:
         case PDMAUDIOMIXERCTL_FRONT:
 #ifdef VBOX_WITH_HDA_51_SURROUND