Changeset 147 for sbliveos2/trunk/drv16/ioctl.cpp

Timestamp:

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

Author:

sandervl

Message:

Fixed wave volume, recording gain + wave recording

File:

• sbliveos2/trunk/drv16/ioctl.cpp (modified) (7 diffs)

sbliveos2/trunk/drv16/ioctl.cpp

@@ -131 +131 @@
          break;
 #if 0
-      case AUDIOHW_FMSYNTH_CAPTURE:
-      case AUDIOHW_FMSYNTH_PLAY:
-      case AUDIOHW_MPU401_CAPTURE:
       case AUDIOHW_MPU401_PLAY:
-         pstream = new MIDISTREAM(HardwareType);
+         pstream = new MIDISTREAM(HardwareType, prp->s.ioctl.usSysFileNum);
          break;
 #endif
@@ -204 +201 @@
    LPMCI_TRACK_INFO    pMasterVol;
    PSTREAM             pStream;
+   ULONG               volume;
 
    if (p->usIOCtlRequest != AUDIO_CHANGE) {
@@ -239 +237 @@
         pStream->SetBalance(pAudChange->lBalance);
 
-   if(pAudChange->lVolume != AUDIO_IGNORE) 
-        pStream->SetVolume(pAudChange->lVolume);
+   if(pAudChange->lVolume != AUDIO_IGNORE) {
+        // stream volume ranges from 0 to 0x7FFFFFFF (linear)
+        volume = pAudChange->lVolume >> 16UL;
+        volume = (volume*100UL)/0x7FFFUL;
+        dprintf(("Set stream volume of %x to %d", prp->s.ioctl.usSysFileNum, volume));
+        pStream->SetVolume(MAKE_VOLUME_LR(volume, volume));
+   }
    
    if(pMasterVol && pMasterVol->usMasterVolume != AUDIO_IGNORE) {
         // master volume ranges from 0 to 0x7FFF (linear)
-        ULONG volume = pMasterVol->usMasterVolume;
-
+        volume = pMasterVol->usMasterVolume;
         volume = (volume*100UL)/0x7FFFUL;               
         if(volume > 100) {
                 volume = 100;
         }
-        volume = (((USHORT)volume << 16) | (USHORT)volume);
-        pStream->SetMasterVol(volume);
-   }
-   for(int i=0;i<8;i++) 
-   {
-        switch(pAudChange->rInputList[0].ulDevType) {
-        case NULL_INPUT:
-                break; //continue;
-        case STEREO_LINE_INPUT:
-        case LEFT_LINE_INPUT:
-        case RIGHT_LINE_INPUT:
-                pStream->SetInputSrc(MIX_RECSRC_LINE);
-                break;
-
-        case MIC_INPUT:
-        case BOOSTED_MIC_INPUT:
-                pStream->SetInputSrc(MIX_RECSRC_MIC);
-                break;
-
-        case PHONE_LINE_INPUT:
-        case HANDSET_INPUT:
-        case SYNTH_INPUT:
-        case DIGITAL_PHONE_LINE_INPUT:
-        case DIGITAL_HANDSET_INPUT:
-        case MIDI_IN_PORT:
-//      case LOOPBACK:
-                pStream->SetInputSrc(MIX_RECSRC_MIXER);
-                break;
-        }
-   }
-   pStream->SetInputGain(pAudChange->lGain);
+        dprintf(("Set mastervolume to %d", volume));
+        pStream->SetMasterVol(MAKE_VOLUME_LR(volume, volume));
+   }
+   if(!fRecSrcIOCTL90) {
+        for(int i=0;i<8;i++) 
+        {
+                switch(pAudChange->rInputList[0].ulDevType) {
+                case NULL_INPUT:
+                        break; //continue;
+                case STEREO_LINE_INPUT:
+                case LEFT_LINE_INPUT:
+                case RIGHT_LINE_INPUT:
+                        pStream->SetInputSrc(MIX_RECSRC_LINE);
+                        break;
+        
+                case MIC_INPUT:
+                case BOOSTED_MIC_INPUT:
+                        pStream->SetInputSrc(MIX_RECSRC_MIC);
+                        break;
+        
+                case PHONE_LINE_INPUT:
+                case HANDSET_INPUT:
+                case SYNTH_INPUT:
+                case DIGITAL_PHONE_LINE_INPUT:
+                case DIGITAL_HANDSET_INPUT:
+                case MIDI_IN_PORT:
+//              case LOOPBACK:
+                        pStream->SetInputSrc(MIX_RECSRC_MIXER);
+                        break;
+                }
+        }
+   }
+   if(!fRecGainIOCTL90 && pAudChange->lGain != AUDIO_IGNORE) {
+        // input ranges from 0 to 0x7FFFFFFF (linear)
+        volume = pAudChange->lGain >> 16UL;
+        volume = (volume*100UL)/0x7FFFUL;
+        if(volume > 100) {
+                volume = 100;
+        }
+        dprintf(("Set input gain of %x to %d", prp->s.ioctl.usSysFileNum, volume));
+        pStream->SetInputGain(MAKE_VOLUME_LR(volume, volume));
+   }
 }
 //******************************************************************************
@@ -322 +335 @@
    switch(prp->s.ioctl.bCode) {
    case MICSET:
-        OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETMICVOL, MAKE_VOLUME(VolumeL, VolumeR));
+        OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETMICVOL, MAKE_VOLUME_LR(VolumeL, VolumeR));
         break;
    case LINESET:
-        OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETLINEINVOL, MAKE_VOLUME(VolumeL, VolumeR));
+        OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETLINEINVOL, MAKE_VOLUME_LR(VolumeL, VolumeR));
         break;
    case CDSET:
-        OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETCDVOL, MAKE_VOLUME(VolumeL, VolumeR));
+        OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETCDVOL, MAKE_VOLUME_LR(VolumeL, VolumeR));
         break;
    case VIDEOSET:
-        OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETVIDEOVOL, MAKE_VOLUME(VolumeL, VolumeR));
+        OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETVIDEOVOL, MAKE_VOLUME_LR(VolumeL, VolumeR));
         break;
    case AUXSET:
-        OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETAUXVOL, MAKE_VOLUME(VolumeL, VolumeR));
+        OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETAUXVOL, MAKE_VOLUME_LR(VolumeL, VolumeR));
         break;
 
    case BASSTREBLESET:
-        OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETBASS, MAKE_VOLUME(VolumeL, VolumeL));
-        OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETTREBLE, MAKE_VOLUME(VolumeR, VolumeR));
+        OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETBASS, MAKE_VOLUME_LR(VolumeL, VolumeL));
+        OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETTREBLE, MAKE_VOLUME_LR(VolumeR, VolumeR));
         break;
 #if 0
@@ -349 +362 @@
         }
         fStreamVolIOCTL90 = TRUE;
-        OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETMASTERVOL, MAKE_VOLUME(VolumeL, VolumeR));
+        OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETMASTERVOL, MAKE_VOLUME_LR(VolumeL, VolumeR));
         break;
 #endif
@@ -395 +408 @@
         }
         fRecGainIOCTL90 = TRUE;
-        OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETINPUTGAIN, MAKE_VOLUME(VolumeL, VolumeR));
+        OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETINPUTGAIN, MAKE_VOLUME_LR(VolumeL, VolumeR));
         break;
 
@@ -427 +440 @@
 
    case GETAPIMAP:
-        if(DevHelp_VerifyAccess(SELECTOROF(pIoctlMap), 256, OFFSETOF(pIoctlMap), VERIFY_READWRITE))
+        if(DevHelp_VerifyAccess(SELECTOROF(pIoctlMap), sizeof(SBLiveIOCTLMap), OFFSETOF(pIoctlMap), VERIFY_READWRITE))
         {
                 dprintf(("Invalid IOCTL90 pointer %lx!!", (ULONG)pMixStruct));