Changeset 451 for GPL

Timestamp:

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

Author:

Paul Smedley

Message:

Update SPEAKER mixer control to PCSPEAKER

Location:

GPL/trunk

Files:

• include/ossdefos2.h (modified) (2 diffs)
• include/ossidc.h (modified) (1 diff)
• lib32/soundmixer.c (modified) (3 diffs)

GPL/trunk/include/ossdefos2.h

@@ -64 +64 @@
 #define OSS_MIXER_SYNTH         3
 #define OSS_MIXER_PCM           4
-#define OSS_MIXER_SPEAKER       5
+#define OSS_MIXER_PCSPEAKER     5
 #define OSS_MIXER_LINE          6
 #define OSS_MIXER_MIC           7
@@ -87 +87 @@
 #define OSS_MIXER_3DCENTER      26
 #define OSS_MIXER_FRONT         27
-#define OSS_MIXER_SPEAKER2      28
+#define OSS_MIXER_SPEAKER       28
 #define OSS_MIXER_HEADPHONE     29
 #define OSS_MIXER_NRDEVICES     30

GPL/trunk/include/ossidc.h

@@ -239 +239 @@
 #define OSS32_MIX_VOLUME_SPDIF          7       //SPDIF volume
 #define OSS32_MIX_VOLUME_VIDEO          8       //Video volume
-#define OSS32_MIX_VOLUME_SPEAKER        9       //PC speaker volume
+#define OSS32_MIX_VOLUME_PCSPEAKER      9       //PC speaker volume
 #define OSS32_MIX_VOLUME_PHONE          10      //Phone volume
 #define OSS32_MIX_VOLUME_HEADPHONE      11      //Headphone volume

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;