Changeset 451 for GPL/trunk/lib32/soundmixer.c

Timestamp:

Jun 18, 2009, 8:19:55 AM (16 years ago)

Author:

Paul Smedley

Message:

Update SPEAKER mixer control to PCSPEAKER

File:

• GPL/trunk/lib32/soundmixer.c (modified) (3 diffs)

GPL/trunk/lib32/soundmixer.c

@@ -50 +50 @@
         /* OSS_MIXER_SYNTH    */ { "Synth", 0 , OSS32_MIX_RECSRC_SYNTH},
         /* OSS_MIXER_PCM      */ { "PCM", 0 , -1},
-        /* OSS_MIXER_SPEAKER  */ { "PC Speaker", 0 , -1},
+        /* OSS_MIXER_PCSPEAKER  */ { "PC Speaker", 0 , -1},
         /* OSS_MIXER_LINE     */ { "Line", 0 , OSS32_MIX_RECSRC_LINE},
         /* OSS_MIXER_MIC      */ { "Mic", 0, OSS32_MIX_RECSRC_MIC},
@@ -440 +440 @@
         idxMute = pHandle->controls[OSS_MIXER_VIDEO].idxMute;
         break;
-    case OSS32_MIX_VOLUME_SPEAKER:
-        idx = pHandle->controls[OSS_MIXER_SPEAKER].idxVolume;
-        idxMute = pHandle->controls[OSS_MIXER_SPEAKER].idxMute;
+    case OSS32_MIX_VOLUME_PCSPEAKER:
+        idx = pHandle->controls[OSS_MIXER_PCSPEAKER].idxVolume;
+        idxMute = pHandle->controls[OSS_MIXER_PCSPEAKER].idxMute;
         if (idx == -1)
         {
-            /* if OSS_MIXER_SPEAKER isn't a valid control, try OSS_MIXER_SPEAKER2 */
-            idx = pHandle->controls[OSS_MIXER_SPEAKER2].idxVolume;
-            idxMute = pHandle->controls[OSS_MIXER_SPEAKER2].idxMute;
+            /* if OSS_MIXER_PCSPEAKER isn't a valid control, try OSS_MIXER_SPEAKER */
+            idx = pHandle->controls[OSS_MIXER_SPEAKER].idxVolume;
+            idxMute = pHandle->controls[OSS_MIXER_SPEAKER].idxMute;
         }
         break;
@@ -758 +758 @@
     case OSS_MIXER_VIDEO:
         return OSS32_MIX_VOLUME_VIDEO;
-    case OSS_MIXER_SPEAKER:
-        return OSS32_MIX_VOLUME_SPEAKER;
+    case OSS_MIXER_PCSPEAKER:
+        return OSS32_MIX_VOLUME_PCSPEAKER;
     case OSS_MIXER_PHONEOUT:
         return OSS32_MIX_VOLUME_PHONE;