Changeset 82

Timestamp:

Sep 13, 2006, 10:19:27 PM (19 years ago)

Author:

vladest

Message:

Stream reusing fix

Location:

GPL/trunk

Files:

• include/version.mak (modified) (1 diff)
• lib32/sound.c (modified) (2 diffs)

GPL/trunk/include/version.mak

@@ -11 +11 @@
 BLDLVL_REVISION = 1.1
 BLDLVL_FILEVER = 4
-BLDLVL_DATETIME = 29.08.2006 22:06:32
+BLDLVL_DATETIME = 10.09.2006 17:47:50
 BLDLVL_MACHINE = VLAD

GPL/trunk/lib32/sound.c

@@ -534 +534 @@
     printk("OSS32_WaveOpen: cp1\n");
     ret = alsa_fops->open(&pHandle->inode, &pHandle->file);
-    printk("OSS32_WaveOpen: cp2\n");
+    printk("OSS32_WaveOpen. ret: %i\n", ret);
     /* check if PCM already opened (stupid uniaud16.sys doesnt closes it) */
     if (ret == -16)
     {
-        kfree(pHandle);
         for (i=0; i < 8*256; i++)
         {
@@ -545 +544 @@
                 if (pStreamId)
                     *pStreamId = (ULONG)opened_handles[i].handle;
-                opened_handles[i].reuse = 1;
-                printk("OSS32_WaveOpen. Reuse streamid %X\n",(ULONG)opened_handles[i].handle);
-                return OSSERR_SUCCESS;
+                opened_handles[i].reuse = 0; /* prevent from reusing */
+                if (OSS32_WaveClose((OSSSTREAMID)opened_handles[i].handle) == 0)
+                {
+                    OSS32_CloseUNI16(); /* say to UNIAUD16 that we closing now */
+                    opened_handles[i].handle = 0;
+                    ret = alsa_fops->open(&pHandle->inode, &pHandle->file);
+                    printk("OSS32_WaveOpen. Reopen ret: %i\n", ret);
+                    break;
+                }
             }
         }