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

Timestamp:

Aug 6, 2009, 11:39:21 AM (16 years ago)

Author:

Paul Smedley

Message:

Fixes to correctly initialise SPEAKER mixer control (missed 1 file)

File:

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

GPL/trunk/lib32/soundmixer.c

@@ -73 +73 @@
         /* OSS_MIXER_3DCENTER */ { "3D Control - Center", 0 , -1},
         /* OSS_MIXER_FRONT    */ { "Front", 0 , -1},
-        /* OSS_MIXER_SPEAKER2 */ { "Speaker", 0 , -1},
+        /* OSS_MIXER_SPEAKER  */ { "Speaker", 0 , -1},
         /* OSS_MIXER_HEADPHONE */ { "Headphone", 0 , -1},
 };
@@ -225 +225 @@
                     {//mute control
                         pHandle->controls[j].idxMute = i;
+                        if (pHandle->controls[j].idxVolume == -1)
+                                pHandle->controls[j].idxVolume = i;
                     }
                     else
@@ -443 +445 @@
         idx = pHandle->controls[OSS_MIXER_PCSPEAKER].idxVolume;
         idxMute = pHandle->controls[OSS_MIXER_PCSPEAKER].idxMute;
-        if (idx == -1)
-        {
-            /* 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;
     case OSS32_MIX_VOLUME_PHONE:
@@ -457 +453 @@
         idx = pHandle->controls[OSS_MIXER_HEADPHONE].idxVolume;
         idxMute = pHandle->controls[OSS_MIXER_HEADPHONE].idxMute;
+        break;
+    case OSS32_MIX_VOLUME_SPEAKER:
+        idx = pHandle->controls[OSS_MIXER_SPEAKER].idxVolume;
+        idxMute = pHandle->controls[OSS_MIXER_SPEAKER].idxMute;
         break;
     case OSS32_MIX_VOLUME_AUX:
@@ -548 +548 @@
 
 fail:
-    printk("OSS32_MixSetVolume failed: %i\n", ret);
     if(pElem) kfree(pElem);
     return ret;
@@ -770 +769 @@
     case OSS_MIXER_HEADPHONE: 
         return OSS32_MIX_VOLUME_HEADPHONE;
+    case OSS_MIXER_SPEAKER:
+        return OSS32_MIX_VOLUME_SPEAKER;
     case OSS_MIXER_LINE1:
         return OSS32_MIX_VOLUME_AUX;