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

Timestamp:

Oct 23, 2006, 11:07:11 PM (19 years ago)

Author:

vladest

Message:

SB code update
HDA code update
Some other updates

File:

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

GPL/trunk/lib32/soundmixer.c

@@ -72 +72 @@
         /* OSS_MIXER_3DDEPTH  */ { "3D Control - Depth", 0 , -1},
         /* OSS_MIXER_3DCENTER */ { "3D Control - Center", 0 , -1},
+        /* OSS_MIXER_FRONT    */ { "Front", 0 , -1},
 };
 char *szRecSources[OSS32_MIX_RECSRC_MAX] = {
@@ -201 +202 @@
                 int controlnamelen = strlen(pHandle->pids[i].name);
 
-                if(namelen == controlnamelen) 
+                if(namelen == controlnamelen)
                 {//control names are identical; found exact match
                     pHandle->controls[j].idxVolume = i;
@@ -392 +393 @@
         idx = pHandle->controls[OSS_MIXER_VOLUME].idxVolume;
         idxMute = pHandle->controls[OSS_MIXER_VOLUME].idxMute;
+        if (idx == -1)
+        {
+            /* HDA codecs workaround */
+            idx = pHandle->controls[OSS_MIXER_FRONT].idxVolume;
+            idxMute = pHandle->controls[OSS_MIXER_FRONT].idxMute;
+        }
         break;
     case OSS32_MIX_VOLUME_MASTER_REAR: //TODO:
@@ -400 +407 @@
         idx = pHandle->controls[OSS_MIXER_PCM].idxVolume;
         idxMute = pHandle->controls[OSS_MIXER_PCM].idxMute;
+        if (idx == -1)
+        {
+            /* HDA codecs workaround */
+            idx = pHandle->controls[OSS_MIXER_FRONT].idxVolume;
+            idxMute = pHandle->controls[OSS_MIXER_FRONT].idxMute;
+        }
         break;
     case OSS32_MIX_VOLUME_MIDI: