Changeset 147 for sbliveos2/trunk/lib32

Timestamp:

Apr 24, 2000, 9:45:21 PM (25 years ago)

Author:

sandervl

Message:

Fixed wave volume, recording gain + wave recording

Location:

sbliveos2/trunk/lib32

Files:

• makefile.os2 (modified) (1 diff)
• sound.c (modified) (3 diffs)
• task.c (modified) (1 diff)

sbliveos2/trunk/lib32/makefile.os2

@@ -86 +86 @@
 $(TARGET).lib: $(TARGET).lnk $(FILES)
     $(LIB) $(TARGET).lib @$(TARGET).lnk
+
+clean:
+     del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap *.lib

sbliveos2/trunk/lib32/sound.c

@@ -329 +329 @@
         return 0;
   }
+  if(ossfile.f_mode == FMODE_READ && *fStart == PCM_ENABLE_INPUT) {
+        //need to call poll to really start the stream
+        int rc;
+        struct poll_table_struct poll = {0};
+
+        rc = oss_devices[ossid].poll(&ossfile, &poll);
+        if(rc & POLLERR)
+                return 0;
+        return 1;
+  }
+  else
   if(oss_devices[ossid].ioctl(&ossinode, &ossfile, cmd, (ULONG)fStart)) {
         return 0;
@@ -459 +470 @@
   case MIX_SETWAVEVOL:
         ioctl = SOUND_MIXER_WRITE_PCM;
-        // channel volume ranges from 0 to 0x7FFFFFFF (linear)
-        volume = volume >> 16;
-        volume = (volume*100)/0x7FFF;
-        volume = (volume << 8) | volume; //l&r
         break;
   case MIX_SETMIDIVOL:
@@ -495 +502 @@
         break;
   case MIX_SETINPUTGAIN:
-        ioctl = SOUND_MIXER_WRITE_IGAIN;
+        ioctl = SOUND_MIXER_WRITE_RECLEV;
         break;
   case MIX_SETLINEINVOL:

sbliveos2/trunk/lib32/task.c

@@ -39 +39 @@
 }
 
-//Not pretty, but sblive driver compared pointers
+//Not pretty, but sblive driver compares pointers
 ULONG OSS32_SetFileId(ULONG fileid)
 {