Changeset 191 for sbliveos2/trunk/drv16


Ignore:
Timestamp:
Sep 28, 2001, 2:10:07 PM (24 years ago)
Author:
sandervl
Message:

rudi's fixes + dac control added

Location:
sbliveos2/trunk/drv16
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • sbliveos2/trunk/drv16/init.cpp

    r188 r191  
    127127   // we can start processing stuff that depends on those switches.
    128128
    129    if (fInt3BeforeInit) int3();
     129   if (fInt3BeforeInit) DebugInt3();
    130130
    131131   // If we got a /V (verbose) flag on the DEVICE= command, route messages
    … …  
    220220   SetHardwareType(AUDIOHW_MPU401_PLAY, MIDI, OPERATION_PLAY, 0);
    221221   SetHardwareType(AUDIOHW_MPU401_PLAY, DATATYPE_MIDI, OPERATION_PLAY, 0);
    222    SetHardwareType(AUDIOHW_MPU401_PLAY,             0, OPERATION_PLAY, 0); //### Must be fixed.
     222
     223////   SetHardwareType(AUDIOHW_MPU401_PLAY,             0, OPERATION_PLAY, 0); //### Must be fixed.
     224   // DART on Warp3
     225   SetHardwareType(AUDIOHW_WAVE_PLAY, DATATYPE_NULL, OPERATION_PLAY, 0);
     226   SetHardwareType(AUDIOHW_WAVE_CAPTURE, DATATYPE_NULL, OPERATION_RECORD, 0);
    223227
    224228   // Build the Wave Playback Hardware object

  • sbliveos2/trunk/drv16/ioctl.cpp

    r188 r191  
    633633        OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETTREBLE, MAKE_VOLUME_LR(VolumeR, VolumeR));
    634634        break;
    635 #if 0
     635
    636636    case STREAMVOLSET:
    637         //release stream volume override?
    638         if(pMixStruct->Mute == 2) {
    639             fStreamVolIOCTL90 = FALSE;
    640             break;
    641         }
    642         fStreamVolIOCTL90 = TRUE;
    643         OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETMASTERVOL, MAKE_VOLUME_LR(VolumeL, VolumeR));
    644         break;
    645 #endif
     637        OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETPCMVOL, MAKE_VOLUME_LR(VolumeL, VolumeR));
     638        break;
    646639
    647640    case RECORDSRCSET:
    … …  
    697690    case RECORDSRCQUERY:
    698691    case RECORDGAINQUERY:
     692    case STREAMVOLQUERY:
    699693        pMixStruct->VolumeL = MixerSettings[prp->s.ioctl.bCode & 0xF].VolumeL;
    700694        pMixStruct->VolumeR = MixerSettings[prp->s.ioctl.bCode & 0xF].VolumeR;
    … …  
    727721        _fmemcpy(pIoctlMap, SBLiveIOCTLMap, sizeof(SBLiveIOCTLMap));
    728722        break;
    729 //   case STREAMVOLQUERY:
     723
    730724//   case MONOINSET:
    731725//   case PHONESET:
    … …  
    760754    SBLiveIOCTLMap[BASSTREBLESET]    = 1;
    761755    SBLiveIOCTLMap[BASSTREBLEQUERY]  = 1;
    762 ////    SBLiveIOCTLMap[STREAMVOLSET]     = 1;
    763 ////    SBLiveIOCTLMap[STREAMVOLQUERY]   = 1;
     756    SBLiveIOCTLMap[STREAMVOLSET]     = 1;
     757    SBLiveIOCTLMap[STREAMVOLQUERY]   = 1;
    764758    SBLiveIOCTLMap[RECORDSRCSET]     = 1;
    765759    SBLiveIOCTLMap[RECORDSRCQUERY]   = 1;
    … …  
    791785    IoctlMixer(&rp);
    792786
    793     //Set bass/treble
     787   //Set aux
     788    rp.s.ioctl.bCode  = AUXSET;
     789    rp.s.ioctl.pvData = (void FAR *)&mixinfo;
     790    mixinfo.Mute    = fAuxMute;
     791    mixinfo.VolumeR = mixinfo.VolumeL = 80;
     792    IoctlMixer(&rp);
     793
     794   //Set bass/treble
    794795    rp.s.ioctl.bCode  = BASSTREBLESET;
    795796    rp.s.ioctl.pvData = (void FAR *)&mixinfo;
    … …  
    812813    IoctlMixer(&rp);
    813814
    814     //Set master volume
     815    //Set PCM volume
    815816    rp.s.ioctl.bCode  = STREAMVOLSET;
    816817    rp.s.ioctl.pvData = (void FAR *)&mixinfo;
    817818    mixinfo.Mute    = 0;
    818     mixinfo.VolumeR = mixinfo.VolumeL = 90;
    819     IoctlMixer(&rp);
    820 
    821     //Release master volume override
    822     rp.s.ioctl.bCode  = STREAMVOLSET;
    823     rp.s.ioctl.pvData = (void FAR *)&mixinfo;
    824     mixinfo.Mute    = 2;
    825819    mixinfo.VolumeR = mixinfo.VolumeL = 90;
    826820    IoctlMixer(&rp);

  • sbliveos2/trunk/drv16/parse.c

    r152 r191  
    8888int fLineMute = TRUE;
    8989int fCDMute   = TRUE;
     90int fAuxMute   = TRUE;
    9091
    9192CHAR *memchr(CHAR *strP, CHAR c, USHORT size)
    … …  
    186187int DoParm(char cParm, int iPort, char __far *pszOption)
    187188{
    188    USHORT us;
    189 
    190189   switch (cParm) {
    191190      case '3':
    … …  
    203202      case 'C':                     // Enable cd
    204203         fCDMute = FALSE;
    205          break;
     204         break;
     205      case 'A':                     // Enable cd
     206         fAuxMute = FALSE;
     207         break;
    206208      case 'N':                     // device header name
    207         if (iPort)
    208             return FALSE;
    209         if (!pszOption)
    210             return FALSE;
     209        if (iPort)
     210            return FALSE;
     211        if (!pszOption)
     212            return FALSE;
    211213         if (!CopyDevicename(pszOption))
    212214            return FALSE;

  • sbliveos2/trunk/drv16/parse.h

    r142 r191  
    8585extern int fLineMute;
    8686extern int fCDMute;
     87extern int fAuxMute;
    8788
    8889#ifdef __cplusplus
Note: See TracChangeset for help on using the changeset viewer.