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

Timestamp:

Jul 20, 2010, 5:46:55 PM (15 years ago)

Author:

David Azarewicz

Message:

Some of my updates from the 2.1.x branch

File:

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

GPL/trunk/lib32/soundmixer.c

@@ -474 +474 @@
     }
     if(idx == -1) {
-        dprintf(("Unknown control %d", line));
+        rprintf(("Unknown control %d", line));
         ret = OSSERR_INVALID_PARAMETER;
         goto fail;
@@ -512 +512 @@
     }
 
-        printk("OSS32_MixSetVolume of %s streamid %X to (%d,%d)(%d,%d) caps %d\n",
+        dprintf(("OSS32_MixSetVolume of %s streamid %X to (%d,%d)(%d,%d) caps %d",
                 pHandle->pids[idx].name, (ULONG)pHandle,
-                GET_VOLUME_L(volume), GET_VOLUME_R(volume), lVol, rVol, pElemInfo->value.integer.max);
-
+                GET_VOLUME_L(volume), GET_VOLUME_R(volume), lVol, rVol, pElemInfo->value.integer.max));
+
+#if 1
+        ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_CTL_IOCTL_ELEM_WRITE, (ULONG)pElem);
+#else
     // looking for more, then one opened streams to prevent of muting active stream
     cnt = 0;
@@ -522 +525 @@
             cnt++;
 
+        dprintf(("OSS32_MixSetVolume old cnt=%X line=%x lVol=%x rVol=%x", cnt, line, lVol, rVol));
     //    if (((cnt == 1 && (lVol==0 && rVol==0)) || (lVol>0 && rVol>0)) ||
     if (cnt == 1 || line != OSS32_MIX_VOLUME_PCM)
     {
+                dprintf(("OSS32_MixSetVolume Ioctl"));
         ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_CTL_IOCTL_ELEM_WRITE, (ULONG)pElem);
 
@@ -534 +539 @@
             pElem->value.integer.value[0] = FALSE;  //switch, not mute control (inversed)
             pElem->value.integer.value[1] = FALSE;
+                        dprintf(("OSS32_MixSetVolume Ioctl mute"));
             ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_CTL_IOCTL_ELEM_WRITE, (ULONG)pElem);
         }
     }
+#endif
 
     kfree(pElem);
     pElem = NULL;
     if(ret) {
-        printk("ret = %i\n", ret);
+        rprintf(("OSS32_MixSetVolume ret=%x", ret));
         DebugInt3();
         return UNIXToOSSError(ret);