Changeset 483

Timestamp:

May 6, 2010, 3:08:34 AM (15 years ago)

Author:

David Azarewicz

Message:

Rework buffer management

Location:

OCO/trunk

Files:

• drv16/commdbg.c (modified) (3 diffs)
• drv16/commdbg.h (modified) (1 diff)
• drv16/dwavestrm.cpp (modified) (10 diffs)
• drv16/event.cpp (modified) (1 diff)
• drv16/fmsynth.cpp (modified) (3 diffs)
• drv16/init.cpp (modified) (2 diffs)
• drv16/ioctl.cpp (modified) (32 diffs)
• drv16/mixer.cpp (modified) (20 diffs)
• drv16/ossidc16.cpp (modified) (5 diffs)
• drv16/rtmidi.cpp (modified) (2 diffs)
• drv16/ssm_idc.cpp (modified) (8 diffs)
• drv16/stream.cpp (modified) (8 diffs)
• drv16/timer.cpp (modified) (2 diffs)
• drv16/waudio.cpp (modified) (45 diffs)
• drv16/waveplay.cpp (modified) (19 diffs)
• drv16/waverec.cpp (modified) (2 diffs)
• drv16/wavestrm.cpp (modified) (34 diffs)
• drv16/wavestrm.hpp (modified) (1 diff)
• include/dbgos2.h (modified) (2 diffs)
• install/control.scr (modified) (2 diffs)
• listerr.cmd (modified) (1 diff)
• uniaud.inc (modified) (2 diffs)

OCO/trunk/drv16/commdbg.c

@@ -204 +204 @@
 
       if (Power==0xF0000000)                  // 1 billion
-         Power=0xF000000;     
+         Power=0xF000000;
       else if (Power==0xF000000)
          Power=0xF00000;
@@ -230 +230 @@
 ULONG DBGCALLCONV _cdecl OSS16_DebugString(char FAR *debstr,ULONG bufsize);
 
+#ifdef DEBUG_COM
+
+short int MAGIC_COMM_PORT = 0x3f8;
+
+
+#define UART_DATA               0x00            // UART Data port
+#define UART_INT_ENAB           0x01            // UART Interrupt enable
+#define UART_INT_ID             0x02            // interrupt ID
+#define UART_LINE_CTRL          0x03            // line control registers
+#define UART_MODEM_CTRL         0x04            // modem control register
+#define UART_LINE_STAT          0x05            // line status register
+#define UART_MODEM_STAT         0x06            // modem status regiser
+#define UART_DIVISOR_LO         0x00            // divisor latch least sig
+#define UART_DIVISOR_HI         0x01h           // divisor latch most sig
+
+#define DELAY   nop
+
+void CharOut(char c)
+{
+        _asm    {
+
+        mov     dx, MAGIC_COMM_PORT     // address of PS/2's first COM port
+        add     dx, UART_LINE_STAT
+
+ReadyCheck:
+        in      al, dx                                                          // wait for comm port ready signal
+
+        DELAY
+        DELAY
+        DELAY
+
+        test    al, 020h
+        jz      ReadyCheck
+
+        // Send the character
+
+        add     dx, UART_DATA - UART_LINE_STAT
+        mov     al,c
+        out     dx, al
+        }
+}
+
+void StringOut(char far *DbgStr)
+{
+   while (*DbgStr)
+      CharOut(*DbgStr++);
+
+   if (fLineTerminate)
+   {
+      CharOut(CR);                              // append carriage return,
+      CharOut(LF);                              // linefeed
+   }
+}
+
+#endif
+
 void cdecl far PrintfOut(char far *DbgStr , ...)
 {
@@ -334 +390 @@
 
    *BuildPtr=0;                                 // cauterize the string
-//PS+++   StringOut((char far *) BuildString);         // print to comm port
+#ifdef DEBUG_COM
+   StringOut((char far *) BuildString);         // print to comm port
+#endif
 //PS++ if want can add option like /Ox and set this if(comport) StringOut((char far *) BuildString);
    OSS16_DebugString((char far *) BuildString,0);         // print to Uniaud32 alsahlp$
 }
 
-#ifdef DEBUG_COM
-
-void StringOut(char far *DbgStr)
-{
-   while (*DbgStr)
-      CharOut(*DbgStr++);
-
-   if (fLineTerminate)
-   {
-      CharOut(CR);                              // append carriage return,
-      CharOut(LF);                              // linefeed
-   }
-}
-
-short int MAGIC_COMM_PORT = 0x3f8;
-
-
-#define UART_DATA               0x00            // UART Data port
-#define UART_INT_ENAB           0x01            // UART Interrupt enable
-#define UART_INT_ID             0x02            // interrupt ID
-#define UART_LINE_CTRL          0x03            // line control registers
-#define UART_MODEM_CTRL         0x04            // modem control register
-#define UART_LINE_STAT          0x05            // line status register
-#define UART_MODEM_STAT         0x06            // modem status regiser
-#define UART_DIVISOR_LO         0x00            // divisor latch least sig
-#define UART_DIVISOR_HI         0x01h           // divisor latch most sig
-
-#define DELAY   nop
-
-void CharOut(char c)
-{
-        _asm    {
-
-        mov     dx, MAGIC_COMM_PORT     // address of PS/2's first COM port
-        add     dx, UART_LINE_STAT
-
-ReadyCheck:
-        in      al, dx                                                          // wait for comm port ready signal
-
-        DELAY
-        DELAY
-        DELAY
-
-        test    al, 020h
-        jz      ReadyCheck
-
-        // Send the character
-
-        add     dx, UART_DATA - UART_LINE_STAT
-        mov     al,c
-        out     dx, al
-        }
-}
-
-#endif

OCO/trunk/drv16/commdbg.h

@@ -1 +1 @@
 #ifndef __COMMDBG_H__
 #define __COMMDBG_H__
+
+#ifdef DEBUG
+//#define DEBUG_COM
+#endif
 
 #ifdef __cplusplus

OCO/trunk/drv16/dwavestrm.cpp

@@ -44 +44 @@
 
     pStream = (PDWAVESTREAM)FindStream_fromFile(ulSysFileNum);
-    if (pStream == NULL) 
+    if (pStream == NULL)
     {
         dprintf(("HookHandler stream %lx not found!", (ULONG) ulSysFileNum));
@@ -124 +124 @@
    if(temp)
    {
-        if(ulStreamState == STREAM_STREAMING) 
+        if(ulStreamState == STREAM_STREAMING)
         {//means we're called during an interrupt
             qhReturn.PushOnTail((PQUEUEELEMENT)temp);
             DevHelp_ArmCtxHook(ulSysFileNum, hCtxHook);
         }
-        else 
+        else
         {
             DevHelp_VMFree((LIN)temp->pBuffptr);
@@ -143 +143 @@
     hSem = pReg->hStream;
 
+#ifdef DEBUG
     dprintf(("DWAVESTREAM::Register"));
+#endif
     if(DevHelp_OpenEventSem(hSem) != 0) {
         dprintf(("DevHlp_OpenEventSem %lx failed!", hSem));
@@ -166 +168 @@
 ULONG DWAVESTREAM::StartStream(void)
 {
-    dprintf(("DWAVESTREAM::StartStream"));
-   return WAVESTREAM::StartStream();
+#ifdef DEBUG
+        dprintf(("DWAVESTREAM::StartStream"));
+#endif
+        return WAVESTREAM::StartStream();
 }
 //*****************************************************************************
@@ -176 +180 @@
    ULONG space, Buff_left, byteswritten;
 
-//    dprintf(("DW::AddBuffers"));
+#ifdef DEBUG
+        dprintf(("DW::AddBuffers"));
+#endif
     if (!pTemp) pTemp = (PSTREAMBUFFER)qhInProcess.Tail();
 
-    if (ulStreamType & STREAM_WRITE && pTemp && pTemp->looping) 
+    if (ulStreamType & STREAM_WRITE && pTemp && pTemp->looping)
     {
         Buff_left = pTemp->ulBuffsz - pTemp->ulBuffpos;
-        if (pahw->GetPosition(StreamId, &_configinfo, &space) != OSSERR_SUCCESS) 
+        if (pahw->GetPosition(StreamId, &_configinfo, &space) != OSSERR_SUCCESS)
         {
             dprintf(("DWAVESTREAM::AddBuffers GetPositions"));
@@ -188 +194 @@
             return;
         }
-        if(fFirst) 
+        if(fFirst)
         {
              space = min(space, 4*_configinfo.ulFragsize);
         }
         else
-        { 
+        {
             space = min(space, _configinfo.ulFragsize);
         }
-        if (space) 
-        {
-           if (space >= Buff_left) 
+        if (space)
+        {
+           if (space >= Buff_left)
            {
               byteswritten = AddBuffer(Buff_left);
-              if (byteswritten == Buff_left) 
+              if (byteswritten == Buff_left)
               {
                   pTemp->ulBuffpos = 0; //reset fill position
@@ -207 +213 @@
               }
            }
-           else 
+           else
            {
               AddBuffer(space);
@@ -214 +220 @@
         pTemp->ulDonepos = 0; //make sure it ::Process never thinks it's done
    }
-   else 
+   else
    {
      WAVESTREAM::AddBuffers(fFirst);
    }
-//    dprintf(("DW::AddBuffers End"));
 }
 //*****************************************************************************
@@ -252 +257 @@
 //*****************************************************************************
 //*****************************************************************************
-ULONG DWAVESTREAM::GetProperty(int type) 
+ULONG DWAVESTREAM::GetProperty(int type)
 {
    switch(type) {
@@ -279 +284 @@
    WAVESTREAM(streamtype, pinit, filesysnum, mixerStreamId), fError(FALSE), hCtxHook(0), hSem(0)
 {
-    dprintf(("DWS::DWS Init"));
-    if (DevHelp_AllocateCtxHook((NPFN)HookHandlerAsm, &hCtxHook)) 
+#ifdef DEBUG
+        dprintf(("DWS::DWS Init"));
+#endif
+    if (DevHelp_AllocateCtxHook((NPFN)HookHandlerAsm, &hCtxHook))
     {
         dprintf(("DWAVESTREAM::DWAVESTREAM AllocCtx"));

OCO/trunk/drv16/event.cpp

@@ -53 +53 @@
    ulPopTime = ulNextTime;
    ulNextTime = 0xFFFFFFFF;
+
 
    // send the event back to the SHDD

OCO/trunk/drv16/fmsynth.cpp

@@ -44 +44 @@
 BOOL FMSYNTH::Open(ULONG ulDevice, ULONG ulStreamType, ULONG ulSysFileNum, OSSSTREAMID FAR *pStreamId)
 {
-    if(midiOutStreamId == 0) 
+    if(midiOutStreamId == 0)
     {
         if(OSS16_MidiOpen(current_device, FM_SEND, pStreamId) != OSSERR_SUCCESS)
@@ -83 +83 @@
 //******************************************************************************
 int FMSYNTH::writeByte(OSSSTREAMID StreamId, BYTE b)
-{ 
-    int dummy = b; 
-    return 0; 
+{
+    int dummy = b;
+    return 0;
 }
 //******************************************************************************
@@ -94 +94 @@
 //******************************************************************************
 int FMSYNTH::readByte(OSSSTREAMID StreamId)
-{ 
-    dprintf(("FMSYNTH::readByte"));
+{
+    //dprintf(("FMSYNTH::readByte"));
     DebugInt3();
-    return -1; 
+    return -1;
 }
 //******************************************************************************

OCO/trunk/drv16/init.cpp

@@ -137 +137 @@
         DosWrite(1, (VOID FAR*)NEWLINE, sizeof(NEWLINE)-1, &result);
         DosWrite(1, (VOID FAR*)szParamError, sizeof(szParamError)-1, &result);
-        return;                 
+        return;
     }
 
@@ -194 +194 @@
         DosWrite(1, (VOID FAR*)szAlsaError, sizeof(szAlsaError)-1, &result);
         DosWrite(1, (VOID FAR*)NEWLINE, sizeof(NEWLINE)-1, &result);
-        return;                 
+        return;
     }
 

OCO/trunk/drv16/ioctl.cpp

@@ -72 +72 @@
       // stream idle bit in the stream state then write the sysfilenum
       // into the request packet, set rc = 0 and return
-   if (p->sMode == IDLE) 
+   if (p->sMode == IDLE)
    {
        pstream = FindStream_fromFile((ULONG) prp->s.ioctl.usSysFileNum);
@@ -117 +117 @@
          //HACK BEGIN
          //SvL: Save stream handle & SHD entrypoint in case MMPM2 reinitializes
-         //     a stream that was already registered 
+         //     a stream that was already registered
          //HACK END
          if(pstream->pfnSHD) {
@@ -145 +145 @@
 
    p->ulFlags = 0;  /* Zero the Flags  */
-   switch (HardwareType) 
+   switch (HardwareType)
    {
       case AUDIOHW_WAVE_PLAY:
@@ -210 +210 @@
 
 #ifdef DEBUG
-   dprintf(("IACapability: dev type: %ld, ldev %d",ulDevicetype, LDev));
+//   dprintf(("IACapability: dev type: %ld, ldev %d",ulDevicetype, LDev));
 #endif
 
@@ -220 +220 @@
    // bailout if no hardware object is returned..
    pHWobj = GetHardwareDevice(ulDevicetype);
-   if (pHWobj) 
+   if (pHWobj)
    {
       pHWobj->DevCaps(p);
-      if (p->ulSupport != SUPPORT_SUCCESS) 
+      if (p->ulSupport != SUPPORT_SUCCESS)
       {
          //PS+++ filling to our parameters as say mmpm2.inf for returning error in this call
@@ -237 +237 @@
    else {
 #ifdef DEBUG
-       dprintf(("IACapability: Error get HW obj"));
+//       dprintf(("IACapability: Error get HW obj"));
 #endif
       //PS+++ filling to our parameters as say mmpm2.inf for returning error in this call
@@ -268 +268 @@
    ULONG               addr;
 
-   if (p->usIOCtlRequest != AUDIO_CHANGE) 
+   if (p->usIOCtlRequest != AUDIO_CHANGE)
    {
        dprintf(("IAudioControl: Error support req:%x",p->usIOCtlRequest));
@@ -282 +282 @@
    addr  = OFFSETOF(pAudChange);
    addr += sizeof(MCI_AUDIO_CHANGE);
-   if(addr >= 0x10000UL) 
+   if(addr >= 0x10000UL)
    {
        dprintf(("Invalid MCI_AUDIO_CHANGE pnt %lx!!", (ULONG)pAudChange));
@@ -294 +294 @@
    addr  = OFFSETOF(pMasterVol);
    addr += sizeof(MCI_TRACK_INFO);
-   if(addr >= 0x10000UL) 
+   if(addr >= 0x10000UL)
    {
        dprintf(("Invalid MCI_TRACK_INFO pnt %lx!!", (ULONG)pMasterVol));
@@ -311 +311 @@
        pStream->SetProperty(PROPERTY_BALANCE, pAudChange->lBalance);
 
-   if (pAudChange->lVolume != AUDIO_IGNORE) 
+   if (pAudChange->lVolume != AUDIO_IGNORE)
    {
        // stream volume ranges from 0 to 0x7FFFFFFF (linear)
@@ -320 +320 @@
    }
 
-   if (pMasterVol && pMasterVol->usMasterVolume != AUDIO_IGNORE) 
+   if (pMasterVol && pMasterVol->usMasterVolume != AUDIO_IGNORE)
    {
        // master volume ranges from 0 to 0x7FFF (linear)
        volume = pMasterVol->usMasterVolume;
        volume = (volume*OSS32_MAX_VOLUME)/0x7FFFUL;
-       if (volume > OSS32_MAX_VOLUME) 
+       if (volume > OSS32_MAX_VOLUME)
        {
            volume = OSS32_MAX_VOLUME;
@@ -331 +331 @@
 //       dprintf(("IlAudioControl:Set MV to %d", volume));
        MixerSetVolume(MixerStreamId, OSS32_MIX_VOLUME_MASTER_FRONT, MAKE_VOLUME_LR(volume, volume));
-       if(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_MASTER_REAR)) 
+       if(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_MASTER_REAR))
        {
            MixerSetVolume(MixerStreamId, OSS32_MIX_VOLUME_MASTER_REAR, MAKE_VOLUME_LR(volume, volume));
@@ -409 +409 @@
         {
             pHWobj->DevCaps(&audioCaps);
-            if (audioCaps.ulSupport != SUPPORT_SUCCESS) 
+            if (audioCaps.ulSupport != SUPPORT_SUCCESS)
             {
                 dprintf(("IDirectAudio: DevCaps failed"));
@@ -417 +417 @@
             }
         }
-        else 
+        else
         {
             dprintf(("IDirectAudio: HW DevCaps failed"));
@@ -427 +427 @@
         pStream = new DWAVESTREAM(AUDIOHW_WAVE_PLAY, pInit,  prp->s.ioctl.usSysFileNum, MixerStreamId);
         if(pStream == NULL) {
-            dprintf(("IDirectAudio: pStream"));
+//            dprintf(("IDirectAudio: pStream"));
             DebugInt3();
             pInit->sReturnCode = INVALID_REQUEST;
@@ -434 +434 @@
         }
 
-        if(!pStream->IsEverythingOk()) 
+        if(!pStream->IsEverythingOk())
         {
             delete pStream;
-            dprintf(("IlDirectAudio: IsEverythingOk"));
+//            dprintf(("IlDirectAudio: IsEverythingOk"));
             DebugInt3();
             pInit->sReturnCode = INVALID_REQUEST;
@@ -482 +482 @@
         {
             pHWobj->DevCaps(&audioCaps);
-            if (audioCaps.ulSupport != SUPPORT_SUCCESS) 
+            if (audioCaps.ulSupport != SUPPORT_SUCCESS)
             {
                 dprintf(("IlDirectAudio: DevCaps failed"));
@@ -489 +489 @@
                 return;
             }
-            dprintf(("IoctlDirectAudio ret0"));
+//            dprintf(("IoctlDirectAudio ret0"));
             pInit->sReturnCode = 0;
             return;
@@ -500 +500 @@
         }
     }
-    else 
-    if(prp->s.ioctl.bCode == DAUDIO_QUERYCAPS) 
+    else
+    if(prp->s.ioctl.bCode == DAUDIO_QUERYCAPS)
     {
         LPOSS32_DEVCAPS lpCaps = (LPOSS32_DEVCAPS) prp->s.ioctl.pvData;
@@ -519 +519 @@
         {
             pHWobj->DevCaps(lpCaps);
-            dprintf(("IoctlDirectAudio ret1"));
-            return;
-        }
-        else 
+//            dprintf(("IoctlDirectAudio ret1"));
+            return;
+        }
+        else
         {
             prp->usStatus |= RPERR;
-            dprintf(("IoctlDirectAudio ret err1"));
+//            dprintf(("IoctlDirectAudio ret err1"));
             return;
         }
@@ -532 +532 @@
 
     pStream = FindStream_fromFile((ULONG) prp->s.ioctl.usSysFileNum);
-    if(pStream == NULL) 
+    if(pStream == NULL)
     {
         dprintf(("IDirectAudio stream %lx not found!", (ULONG) prp->s.ioctl.usSysFileNum));
@@ -553 +553 @@
     {
     case DAUDIO_CLOSE:
-         dprintf(("ID close"));
+//         dprintf(("ID close"));
         delete pStream;
         break;
@@ -559 +559 @@
     case DAUDIO_SETVOLUME:
     {
-        dprintf(("ID SetVolume"));
+//        dprintf(("ID SetVolume"));
         pStream->SetProperty(PROPERTY_VOLUME, MAKE_VOLUME_LR(pDAudioCmd->Vol.VolumeL, pDAudioCmd->Vol.VolumeR));
         break;
@@ -566 +566 @@
     case DAUDIO_GETVOLUME:
     {
-        dprintf(("ID GetVolume"));
+//        dprintf(("ID GetVolume"));
         pDAudioCmd->Vol.VolumeL = GET_VOLUME_L(pStream->GetProperty(PROPERTY_VOLUME));
         pDAudioCmd->Vol.VolumeR = GET_VOLUME_R(pStream->GetProperty(PROPERTY_VOLUME));
@@ -575 +575 @@
     {
         dprintf(("ID Start NF:%d",(USHORT)numFreeStreams));
-        if(numFreeStreams > 0) 
+        if(numFreeStreams > 0)
         {
               rc = pStream->StartStream();
@@ -631 +631 @@
     case DAUDIO_SETPROPERTY:
     {
-        dprintf(("ID SetProp"));
+//        dprintf(("ID SetProp"));
         rc = pStream->SetProperty((USHORT)pDAudioCmd->SetProperty.type, pDAudioCmd->SetProperty.value);
         break;
@@ -640 +640 @@
         DDCMDREGISTER reg;
 
-        dprintf(("ID Reg"));
+//        dprintf(("ID Reg"));
         reg.ulFunction     = DDCMD_REG_STREAM;
         reg.hStream        = pDAudioCmd->Thread.hSemaphore;
@@ -651 +651 @@
     case DAUDIO_DEREGISTER_THREAD:
     {
-        dprintf(("ID DeReg"));
+//        dprintf(("ID DeReg"));
         pStream->DeRegister();
         break;
@@ -657 +657 @@
 
     case DAUDIO_QUERYVERSION:
-        dprintf(("ID qVer"));
+//        dprintf(("ID qVer"));
         pDAudioCmd->Version.ulVersion = DAUDIO_VERSION;
         break;
     }
 
-    if(rc) 
-    {
-        dprintf(("IoctlDirectAudio ret err rc=%ld",rc));
+    if(rc)
+    {
+//        dprintf(("IoctlDirectAudio ret err rc=%ld",rc));
         prp->usStatus |= RPERR | RPBADCMD;
         return;
@@ -687 +687 @@
 extern "C" void StrategyIoctl(PREQPACKET prp, USHORT LDev)
 {
-    if (prp->s.ioctl.bCategory == DAUDIO_IOCTL_CAT) 
+    if (prp->s.ioctl.bCategory == DAUDIO_IOCTL_CAT)
     {
         IoctlDirectAudio(prp);
@@ -696 +696 @@
     dprintf(("StrategyIoctl:cat:0x%x, code:0x%x cd %d gd %d", prp->s.ioctl.bCategory, prp->s.ioctl.bCode, current_device, LDev));
 #endif
-    if (prp->s.ioctl.bCategory == 0x90) 
+    if (prp->s.ioctl.bCategory == 0x90)
     {
         IoctlMixer(prp, LDev);
         return;
     }
-    if (prp->s.ioctl.bCategory != AUDIO_IOCTL_CAT) 
+    if (prp->s.ioctl.bCategory != AUDIO_IOCTL_CAT)
     {
         prp->usStatus |= RPERR | RPBADCMD;
@@ -724 +724 @@
 
 #ifdef DEBUG
-    dprintf(("StrategyIoctl:ret:0x%x", (USHORT)prp->usStatus));
+//    dprintf(("StrategyIoctl:ret:0x%x", (USHORT)prp->usStatus));
 #endif
     return;

OCO/trunk/drv16/mixer.cpp

@@ -81 +81 @@
 /* OSS32_MIX_VOLUME_SPEAKER       */   MONOINSET & 0xF,
 /* OSS32_MIX_VOLUME_PHONE         */   PHONESET & 0xF,
-/* OSS32_MIX_VOLUME_HEADPHONE     */   -1, 
+/* OSS32_MIX_VOLUME_HEADPHONE     */   -1,
 /* OSS32_MIX_VOLUME_AUX           */   AUXSET & 0xF,
 /* OSS32_MIX_VOLUME_CAPTURE       */   RECORDGAINSET & 0xF,
@@ -109 +109 @@
     USHORT    VolumeL, VolumeR;
 
+    //dprintf(("IoctlMixer Dev=%x Code=%x Data=%x", LDev, prp->s.ioctl.bCode, prp->s.ioctl.pvData));
     if((prp->s.ioctl.bCode & 0xF0) == 0x40)
     {
@@ -123 +124 @@
         if(prp->s.ioctl.bCode == RECORDSRCSET ||
            prp->s.ioctl.bCode == RECORDGAINSET ||
-           prp->s.ioctl.bCode == STREAMVOLSET) 
+           prp->s.ioctl.bCode == STREAMVOLSET)
         {
              if(pMixStruct->Mute != 2) { //don't save lock override value
@@ -149 +150 @@
     }
 
-    if(prp->s.ioctl.bCode >= MONOINSET && prp->s.ioctl.bCode <= RECORDGAINSET) 
+    if(prp->s.ioctl.bCode >= MONOINSET && prp->s.ioctl.bCode <= RECORDGAINSET)
     {
         int idx = prp->s.ioctl.bCode & 0xF;
@@ -198 +199 @@
                 break;
             }
-            MixerSetProperty(MixerStreamId, OSS32_MIX_INPUTSRC, recsrc, 
+            MixerSetProperty(MixerStreamId, OSS32_MIX_INPUTSRC, recsrc,
                              MIXFLAG_FORCE_UPDATE|MIXFLAG_IOCTL90);
             break;
@@ -210 +211 @@
             fRecGainIOCTL90 = TRUE;
             //must use left volume value only
-            MixerSetVolume(MixerStreamId, OSS32_MIX_VOLUME_CAPTURE, MAKE_VOLUME_LR(VolumeL, VolumeL), 
+            MixerSetVolume(MixerStreamId, OSS32_MIX_VOLUME_CAPTURE, MAKE_VOLUME_LR(VolumeL, VolumeL),
                            MIXFLAG_FORCE_UPDATE|MIXFLAG_IOCTL90);
             break;
@@ -223 +224 @@
 
             fPCMVolIOCTL90 = TRUE;
-            MixerSetVolume(MixerStreamId, OSS32_MIX_VOLUME_PCM, MAKE_VOLUME_LR(VolumeL, VolumeR), 
+            MixerSetVolume(MixerStreamId, OSS32_MIX_VOLUME_PCM, MAKE_VOLUME_LR(VolumeL, VolumeR),
                            MIXFLAG_FORCE_UPDATE|MIXFLAG_IOCTL90);
             break;
@@ -233 +234 @@
         }
     }
-    else 
-    if(prp->s.ioctl.bCode >= MONOINQUERY && prp->s.ioctl.bCode <= RECORDGAINQUERY) 
+    else
+    if(prp->s.ioctl.bCode >= MONOINQUERY && prp->s.ioctl.bCode <= RECORDGAINQUERY)
      {
         int idx = prp->s.ioctl.bCode & 0xF;
@@ -289 +290 @@
                 return;
             }
-        }        
-        else 
+        }
+        else
         if(oldsem) {
             if(DevHelp_CloseEventSem(oldsem) != 0) {
@@ -333 +334 @@
 
     //if input gain is not supported by hardware, then change line volume
-    if(ulControl == OSS32_MIX_VOLUME_CAPTURE && !(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_CAPTURE))) 
+    if(ulControl == OSS32_MIX_VOLUME_CAPTURE && !(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_CAPTURE)))
     {
         dprintf(("MixerSetVolume: No input gain -> change line volume!!"));
@@ -359 +360 @@
     }
 
-    if(!(fFlags & MIXFLAG_DONTSAVE)) 
-    {
-        if(ulControl < OSS32_MIX_MAX_CONTROLS && ALSAToIOCTL90Control[ulControl] != -1) 
+    if(!(fFlags & MIXFLAG_DONTSAVE))
+    {
+        if(ulControl < OSS32_MIX_MAX_CONTROLS && ALSAToIOCTL90Control[ulControl] != -1)
         {
             int idx = ALSAToIOCTL90Control[ulControl];
@@ -409 +410 @@
     }
 
-    if(ulControl < OSS32_MIX_MAX_CONTROLS && (mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(ulControl))) 
-    {
-        ulVolume = MAKE_VOLUME_LR(MixerSettingsALSA[ulControl].VolumeL, 
+    if(ulControl < OSS32_MIX_MAX_CONTROLS && (mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(ulControl)))
+    {
+        ulVolume = MAKE_VOLUME_LR(MixerSettingsALSA[ulControl].VolumeL,
                                   MixerSettingsALSA[ulControl].VolumeR);
     }
@@ -424 +425 @@
     ULONG ulVolume = 0;
 
-    if(ulControl < OSS32_MIX_MAX_CONTROLS && (mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(ulControl))) 
-    {
-        ulVolume = MAKE_VOLUME_LR(MixerSettingsALSA[ulControl].VolumeL, 
+    if(ulControl < OSS32_MIX_MAX_CONTROLS && (mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(ulControl)))
+    {
+        ulVolume = MAKE_VOLUME_LR(MixerSettingsALSA[ulControl].VolumeL,
                                   MixerSettingsALSA[ulControl].VolumeR);
     }
@@ -435 +436 @@
 //******************************************************************************
 void DBGCALLCONV MixerSuspend()
-{ 
+{
     ULONG ulVolume;
     int i;
 
-    dprintf(("MixerSuspend"));
+        //dprintf(("MixerSuspend"));
 
     for(i=0;i<=OSS32_MIX_VOLUME_MAX;i++) {
@@ -470 +471 @@
     int i;
 
-    dprintf(("MixerRestoreState"));
+        //dprintf(("MixerRestoreState"));
 
     //restore mixer control volume
@@ -586 +587 @@
 
     if(hMixerNotifySem) {
-        dprintf(("Notify mixer change"));
+                //dprintf(("Notify mixer change"));
         rc = DevHelp_PostEventSem(hMixerNotifySem);
         if(rc != 0) {
@@ -611 +612 @@
     USHORT lVolume, rVolume;
 
-    if(OSS16_MixOpen(LDev, &MixerStreamId) != OSSERR_SUCCESS) 
+    if(OSS16_MixOpen(LDev, &MixerStreamId) != OSSERR_SUCCESS)
     {
         DebugInt3();
@@ -617 +618 @@
         return;
     }
-    if(OSS16_MixQueryCaps(MixerStreamId, &mixcaps) != OSSERR_SUCCESS) 
+    if(OSS16_MixQueryCaps(MixerStreamId, &mixcaps) != OSSERR_SUCCESS)
     {
         DebugInt3();
@@ -685 +686 @@
         ALSAIOCTLMap[VIDEOSET]         = 1;
         ALSAIOCTLMap[VIDEOQUERY]       = 1;
-    
+
         //Set VIDEO
         rp.s.ioctl.bCode  = VIDEOSET;
@@ -702 +703 @@
         mixinfo.Mute    = 1;
         mixinfo.VolumeR = mixinfo.VolumeL = 80;
-        IoctlMixer(&rp, LDev);    
+        IoctlMixer(&rp, LDev);
     }
     if(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_PHONE)) {

OCO/trunk/drv16/ossidc16.cpp

@@ -279 +279 @@
 //******************************************************************************
 //******************************************************************************
-//******************************************************************************
-//******************************************************************************
 OSSRET DBGCALLCONV OSS16_WaveGetHwPtr(OSSSTREAMID StreamId, ULONG FAR *lpBytesLeft)
 {
@@ -295 +293 @@
    return ret;
 }
+//******************************************************************************
+//******************************************************************************
 OSSRET DBGCALLCONV OSS16_WaveSetVolume(OSSSTREAMID StreamId, ULONG volume)
 {
@@ -688 +688 @@
 #pragma on (unreferenced)
 {
-//    dprintf(("OSSIDC ep. cmd: %x param1: %x, param2: %x",cmd, param1, param2));
+    //dprintf(("OSSIDC cmd:%lx param1:%lx param2:%lx", cmd, param1, param2));
     switch(cmd & 0xFFFF)
     {
@@ -715 +715 @@
     {
         PWAVESTREAM pStream;
-//           dprintf(("IDC16_PROCESS"));
-           //Signal all active wave playback streams to update their status
+                //dprintf(("IDC16_PROCESS, %d", param1));
+        //Signal all active wave playback streams to update their status
             pStream = (PWAVESTREAM)FindFirstActiveStream(STREAM_WAVE_PLAY);
-            while(pStream) 
+            while(pStream)
            {
                 pStream->Process();
@@ -725 +725 @@
            //Signal all active wave capture streams to update their status
            pStream = (PWAVESTREAM)FindFirstActiveStream(STREAM_WAVE_CAPTURE);
-           while(pStream) 
+           while(pStream)
            {
                  pStream->Process();
                  pStream = (PWAVESTREAM)FindNextActiveStream(STREAM_WAVE_CAPTURE, pStream);
            }
-//           dprintf(("IDC16_PROCESS end"));
+                        //dprintf(("IDC16_PROCESS end"));
            break;
     }

OCO/trunk/drv16/rtmidi.cpp

@@ -209 +209 @@
     MIDIAUDIO *pma = (MIDIAUDIO *) pMidiAudio;
 
-    dprintf(("rtmidi: RecvByte"));
+    //dprintf(("rtmidi: RecvByte"));
 
    if(!pma) {
@@ -233 +233 @@
    MIDIAUDIO *pma = (MIDIAUDIO *) pMidiAudio;
 
-   dprintf(("rtmidi: RecvString"));
+   //dprintf(("rtmidi: RecvString"));
 
    if(!pma) {

OCO/trunk/drv16/ssm_idc.cpp

@@ -43 +43 @@
    }
 #endif
-
    switch (pCommon->ulFunction) {
 
       case DDCMD_SETUP: {
+         ddprintf(("DDCMD_SETUP"));
          if (!pstream)
          {
@@ -56 +56 @@
          pstream->SetCurrentTime(psp->ulStreamTime);
 
-           // if there is a flags field in the SETUP_PARM
-           // the tell MMPM it can send us 'RECURRING' events....
-         if (p->ulSetupParmSize > sizeof(ULONG)) 
+         // if there is a flags field in the SETUP_PARM
+         // the tell MMPM it can send us 'RECURRING' events....
+         if (p->ulSetupParmSize > sizeof(ULONG))
          {
-//            dprintf(("DDCMD_SETUP ParmSize %ld", p->ulSetupParmSize));
+                        // dprintf(("DDCMD_SETUP ParmSize %ld", p->ulSetupParmSize));
             psp->ulFlags = SETUP_RECURRING_EVENTS;
          }
@@ -68 +68 @@
          ddprintf(("DDCMD_READ"));
          PDDCMDREADWRITE p=(PDDCMDREADWRITE) pCommon;
-
 
          if (!pstream)
@@ -79 +78 @@
       }
       // Task time
-      case DDCMD_WRITE: 
+      case DDCMD_WRITE:
       {
            PDDCMDREADWRITE p=(PDDCMDREADWRITE) pCommon;
-           ULONG           Space;
 
            if (!pstream)
@@ -89 +87 @@
               return ERROR_INVALID_STREAM;
            }
-#ifdef PS_Thinking
-           OSS16_WaveGetSpace(pstream->StreamId, &Space);
-           ddprintf(("DDCMD_WRITE %lx space %lx",p->ulBufferSize, Space));
-           if (Space < p->ulBufferSize)
-           {
-               DevHelp_ProcBlock (pstream->StreamId, 2, 0);
-               ddprintf(("DDCMD_WRITE after %lx space %lx",p->ulBufferSize, Space));
-           }
-#endif
-//           ddprintf(("DDCMD_WRITE"));
            ulReturnCode = pstream->Write((PSTREAMBUF) p->pBuffer,(unsigned) p->ulBufferSize);
-           ddprintf(("DDCMD_WRITE %lx rc=%ld",p->ulBufferSize, ulReturnCode));
+           ddprintf(("DDCMD_WRITE %lx %lx rc=%ld", p->pBuffer, p->ulBufferSize, ulReturnCode));
            if (ulReturnCode)
               return ulReturnCode;
@@ -106 +94 @@
       }
       case DDCMD_STATUS: {
-         ddprintf(("DDCMD_STATUS"));
-         PDDCMDSTATUS p = (PDDCMDSTATUS) pCommon;
-         PSTATUS_PARM p2 = (PSTATUS_PARM) p->pStatus;
-         if (!pstream)
-           return ERROR_INVALID_STREAM;
-         p2->ulTime = pstream->GetCurrentTime();
-//         ddprintf(("DDCMD_STATUS time:%ld",p2->ulTime));
-         break;
+                PDDCMDSTATUS p = (PDDCMDSTATUS) pCommon;
+                PSTATUS_PARM p2 = (PSTATUS_PARM) p->pStatus;
+                if (!pstream)
+                        return ERROR_INVALID_STREAM;
+                p2->ulTime = pstream->GetCurrentTime();
+                ddprintf(("DDCMD_STATUS time:%lx", p2->ulTime));
+                break;
       }
-      case DDCMD_CONTROL: 
+      case DDCMD_CONTROL:
       {
          PDDCMDCONTROL p = (PDDCMDCONTROL) pCommon;
@@ -124 +111 @@
          }
 
-         switch (p->ulCmd) 
+         switch (p->ulCmd)
          {
          case DDCMD_START:
              ddprintf(("DDCMD_START"));
              ulReturnCode = pstream->StartStream();
-             ddprintf(("DDCMD_START End rc=%ld",ulReturnCode));
+             //ddprintf(("DDCMD_START End rc=%ld",ulReturnCode));
              return ulReturnCode;
          case DDCMD_STOP:
              ddprintf(("DDCMD_STOP"));
-//             DevHelp_ProcBlock ((ULONG)p, 2, 0);
+                        //DevHelp_ProcBlock ((ULONG)p, 2, 0);
              p->ulParmSize=sizeof(ULONG);
              return pstream->StopStream((PCONTROL_PARM)p->pParm);
@@ -156 +143 @@
              return pstream->ResumeStreamTime();
          default:
+                ddprintf(("DDCMD INVALID REQUEST\n"));
             return ERROR_INVALID_REQUEST;
          } /* endswitch */
       }
-      case DDCMD_REG_STREAM: 
+      case DDCMD_REG_STREAM:
       {
          ddprintf(("DDCMD_REG_STREAM size:%lx countbuf:%lx",((PDDCMDREGISTER) pCommon)->ulBufSize, ((PDDCMDREGISTER) pCommon)->ulNumBufs));

OCO/trunk/drv16/stream.cpp

@@ -46 +46 @@
    PSTREAMBUFFER temp = (PSTREAMBUFFER)qhDone.PopHead();
 
-   if (temp) 
+   if (temp)
    {
             shdri.ulFunction = SHD_REPORT_INT;
@@ -52 +52 @@
         // if this is a write (playback) then set the streamtype and
         // tell the stream handler that we played all of the buffer.
-        if (ulStreamType & STREAM_WRITE) 
-       {
+        if (ulStreamType & STREAM_WRITE)
+        {
                 shdri.ulFlag = SHD_WRITE_COMPLETE;
                 shdri.ulStatus = temp->ulBuffsz;
@@ -66 +66 @@
         shdri.pBuffer = temp->pBuffptr;
         shdri.ulStreamTime = GetCurrentTime();
+                //ddprintf(("Returning %lx Time=%lx", temp->pBuffptr, shdri.ulStreamTime));
         pfnSHD(&shdri);
         delete temp;
@@ -94 +95 @@
 //SvL: BUGFIX: check all events
 #if 1
-   if (qhEvent.IsElements()) {
-        PEVENT pnextevent = (PEVENT)qhEvent.Head();
-        ULONG  time = GetCurrentTime();
-        while(pnextevent) {
-                ULONG eventtime = pnextevent->GetEventTime();
-                if (eventtime <= time)
-                        pnextevent->Report(time);
-                pnextevent = (PEVENT)pnextevent->pNext;
+        if (qhEvent.IsElements()) {
+                PEVENT pnextevent = (PEVENT)qhEvent.Head();
+                ULONG  time = GetCurrentTime();
+                while(pnextevent) {
+                        ULONG eventtime = pnextevent->GetEventTime();
+                        if (eventtime <= time)
+                                pnextevent->Report(time);
+                        pnextevent = (PEVENT)pnextevent->pNext;
+                }
         }
-   }
 #else
    if (qhEvent.IsElements()) {
@@ -173 +174 @@
 ULONG STREAM::Register(PDDCMDREGISTER p)
 {
-   ddprintf(("STREAM::Register"));
+//   ddprintf(("STREAM::Register"));
    hstream             = p->hStream;
    pfnSHD              = (PFN_SHD) p->pSHDEntryPoint;
@@ -236 +237 @@
    // event to time out.. if it is not already on
    // the head of the Event queue then put it there
-   if (pele2 != qhEvent.Head()) 
+   if (pele2 != qhEvent.Head())
    {
       cli();
@@ -328 +329 @@
 //******************************************************************************
 //******************************************************************************
-ULONG STREAM::GetProperty(int type) 
+ULONG STREAM::GetProperty(int type)
 {
    switch(type) {
@@ -358 +359 @@
 }
 //******************************************************************************
-static int streamtype[STREAM_MAX_TYPES] = {STREAM_WAVE_CAPTURE, STREAM_WAVE_PLAY, 
+static int streamtype[STREAM_MAX_TYPES] = {STREAM_WAVE_CAPTURE, STREAM_WAVE_PLAY,
                                            STREAM_MPU401_CAPTURE,
                                            STREAM_MPU401_PLAY, STREAM_FMSYNTH_PLAY};

OCO/trunk/drv16/timer.cpp

@@ -127 +127 @@
    pStream = (MIDISTREAM*) FindActiveStream( ulStreamType );
 
-   dprintf(("TIMER::Ctx"));
+//   dprintf(("TIMER::Ctx"));
    if (pStream)   // Should always be a valid fn adr when timer is running.
       pStream->Process();
@@ -399 +399 @@
       uMSec = _uInterval_mSec;
       _uCumulativeError += _uIntervalErr_uSec;
-      if (_uCumulativeError >= 1000) 
+      if (_uCumulativeError >= 1000)
       {
 //PS++ begin

OCO/trunk/drv16/waudio.cpp

@@ -559 +559 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,0);   //factor 1
         pConfigInfo->pfnConvert = ConvertNone;
-        dprintf(("CNV_NONE"));
+//        dprintf(("CNV_NONE"));
         break;
 
@@ -566 +566 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,0);   //factor 1
         pConfigInfo->pfnConvert = Convert8To8SignChange;
-        dprintf(("CNV_8_U_TO_8_S/CNV_8_S_TO_8_U"));
+//        dprintf(("CNV_8_U_TO_8_S/CNV_8_S_TO_8_U"));
         break;
 
@@ -573 +573 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(1,0);   //factor 2
         pConfigInfo->pfnConvert = Convert8MonoTo8Stereo;
-        dprintf(("CNV_8_U_TO_8_U_MN_ST/CNV_8_S_TO_8_S_MN_ST"));
+//        dprintf(("CNV_8_U_TO_8_U_MN_ST/CNV_8_S_TO_8_S_MN_ST"));
         break;
 
@@ -580 +580 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(1,0);   //factor 2
         pConfigInfo->pfnConvert = Convert8MonoTo8StereoSignChange;
-        dprintf(("CNV_8_S_TO_8_U_MN_ST/CNV_8_U_TO_8_S_MN_ST"));
+//        dprintf(("CNV_8_S_TO_8_U_MN_ST/CNV_8_U_TO_8_S_MN_ST"));
         break;
 
@@ -587 +587 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(1,0);   //factor 2
         pConfigInfo->pfnConvert = Convert8To16;
-        dprintf(("CNV_8_S_TO_16_S/CNV_8_U_TO_16_U"));
+//        dprintf(("CNV_8_S_TO_16_S/CNV_8_U_TO_16_U"));
         break;
 
@@ -594 +594 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(1,0);   //factor 2
         pConfigInfo->pfnConvert = Convert8To16SignChange;
-        dprintf(("CNV_8_S_TO_16_U/CNV_8_U_TO_16_S"));
+        //dprintf(("CNV_8_S_TO_16_U/CNV_8_U_TO_16_S"));
         break;
 
@@ -601 +601 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(2,0);   //factor 4
         pConfigInfo->pfnConvert = Convert8MonoTo16Stereo;
-        dprintf(("CNV_8_S_TO_16_S_MN_ST/CNV_8_U_TO_16_U_MN_ST"));
+        //dprintf(("CNV_8_S_TO_16_S_MN_ST/CNV_8_U_TO_16_U_MN_ST"));
         break;
 
@@ -608 +608 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(2,0);   //factor 4
         pConfigInfo->pfnConvert = Convert8MonoTo16StereoSignChange;
-        dprintf(("CNV_8_S_TO_16_U_MN_ST/CNV_8_U_TO_16_S_MN_ST"));
+        //dprintf(("CNV_8_S_TO_16_U_MN_ST/CNV_8_U_TO_16_S_MN_ST"));
         break;
 
@@ -614 +614 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,1);   //factor 0.5
         pConfigInfo->pfnConvert = Convert8UnsignedTo8UnsignedStereoMono;
-        dprintf(("CNV_8_U_TO_8_U_ST_MN"));
+        //dprintf(("CNV_8_U_TO_8_U_ST_MN"));
         break;
 
@@ -620 +620 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,1);   //factor 0.5
         pConfigInfo->pfnConvert = Convert8SignedTo8SignedStereoMono;
-        dprintf(("CNV_8_S_TO_8_S_ST_MN"));
+        //dprintf(("CNV_8_S_TO_8_S_ST_MN"));
         break;
 
@@ -626 +626 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,1);   //factor 0.5
         pConfigInfo->pfnConvert = Convert8UnsignedTo8SignedStereoMono;
-        dprintf(("CNV_8_U_TO_8_S_ST_MN"));
+        //dprintf(("CNV_8_U_TO_8_S_ST_MN"));
         break;
 
@@ -632 +632 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,1);   //factor 0.5
         pConfigInfo->pfnConvert = Convert8SignedTo8UnsignedStereoMono;
-        dprintf(("CNV_8_S_TO_8_U_ST_MN"));
+        //dprintf(("CNV_8_S_TO_8_U_ST_MN"));
         break;
 
@@ -638 +638 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,0);   //factor 1
         pConfigInfo->pfnConvert = Convert8UnsignedTo16UnsignedStereoMono;
-        dprintf(("CNV_8_U_TO_16_U_ST_MN"));
+        //dprintf(("CNV_8_U_TO_16_U_ST_MN"));
         break;
 
@@ -644 +644 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,0);   //factor 1
         pConfigInfo->pfnConvert = Convert8UnsignedTo16SignedStereoMono;
-        dprintf(("CNV_8_U_TO_16_S_ST_MN"));
+        //dprintf(("CNV_8_U_TO_16_S_ST_MN"));
         break;
 
@@ -650 +650 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,0);   //factor 1
         pConfigInfo->pfnConvert = Convert8SignedTo16SignedStereoMono;
-        dprintf(("CNV_8_S_TO_16_S_ST_MN"));
+        //dprintf(("CNV_8_S_TO_16_S_ST_MN"));
         break;
 
@@ -656 +656 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,0);   //factor 1
         pConfigInfo->pfnConvert = Convert8SignedTo16UnsignedStereoMono;
-        dprintf(("CNV_8_S_TO_16_U_ST_MN"));
+        //dprintf(("CNV_8_S_TO_16_U_ST_MN"));
         break;
 
@@ -663 +663 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,0);   //factor 1
         pConfigInfo->pfnConvert = Convert16To16SignChange;
-        dprintf(("CNV_16_U_TO_16_S/CNV_16_S_TO_16_U"));
+        //dprintf(("CNV_16_U_TO_16_S/CNV_16_S_TO_16_U"));
         break;
 
@@ -670 +670 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,1);   //factor 0.5
         pConfigInfo->pfnConvert = Convert16To8;
-        dprintf(("CNV_16_U_TO_8_U/CNV_16_S_TO_8_S"));
+        //dprintf(("CNV_16_U_TO_8_U/CNV_16_S_TO_8_S"));
         break;
 
@@ -677 +677 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,1);   //factor 0.5
         pConfigInfo->pfnConvert = Convert16To8SignChange;
-        dprintf(("CNV_16_U_TO_8_S/CNV_16_S_TO_8_U"));
+        //dprintf(("CNV_16_U_TO_8_S/CNV_16_S_TO_8_U"));
         break;
 
@@ -684 +684 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(1,0);   //factor 2
         pConfigInfo->pfnConvert = Convert16MonoTo16Stereo;
-        dprintf(("CNV_16_U_TO_16_U_MN_ST/CNV_16_S_TO_16_S_MN_ST"));
+        //dprintf(("CNV_16_U_TO_16_U_MN_ST/CNV_16_S_TO_16_S_MN_ST"));
         break;
 
@@ -691 +691 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(1,0);   //factor 2
         pConfigInfo->pfnConvert = Convert16MonoTo16StereoSignChange;
-        dprintf(("CNV_16_U_TO_16_S_MN_ST/CNV_16_S_TO_16_U_MN_ST"));
+        //dprintf(("CNV_16_U_TO_16_S_MN_ST/CNV_16_S_TO_16_U_MN_ST"));
         break;
 
@@ -698 +698 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,0);   //factor 1
         pConfigInfo->pfnConvert = Convert16MonoTo8Stereo;
-        dprintf(("CNV_16_U_TO_8_U_MONO_ST/CNV_16_S_TO_8_U_MN_ST"));
+        //dprintf(("CNV_16_U_TO_8_U_MONO_ST/CNV_16_S_TO_8_U_MN_ST"));
         break;
 
@@ -705 +705 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,0);   //factor 1
         pConfigInfo->pfnConvert = Convert16MonoTo8StereoSignChange;
-        dprintf(("CNV_16_U_TO_8_S_MN_ST/CNV_16_S_TO_8_S_MN_ST"));
+        //dprintf(("CNV_16_U_TO_8_S_MN_ST/CNV_16_S_TO_8_S_MN_ST"));
         break;
 
@@ -711 +711 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,1);   //factor 0.5
         pConfigInfo->pfnConvert = Convert16UnsignedTo16SignedStereoMono;
-        dprintf(("CNV_16_U_TO_16_S_ST_MN"));
+        //dprintf(("CNV_16_U_TO_16_S_ST_MN"));
         break;
 
@@ -717 +717 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,1);   //factor 0.5
         pConfigInfo->pfnConvert = Convert16UnsignedTo16UnsignedStereoMono;
-        dprintf(("CNV_16_U_TO_16_U_ST_MN"));
+        //dprintf(("CNV_16_U_TO_16_U_ST_MN"));
         break;
 
@@ -723 +723 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,1);   //factor 0.5
         pConfigInfo->pfnConvert = Convert16SignedTo16SignedStereoMono;
-        dprintf(("CNV_16_S_TO_16_S_ST_MN"));
+        //dprintf(("CNV_16_S_TO_16_S_ST_MN"));
         break;
 
@@ -729 +729 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,1);   //factor 0.5
         pConfigInfo->pfnConvert = Convert16SignedTo16UnsignedStereoMono;
-        dprintf(("CNV_16_S_TO_16_U_ST_MN"));
+        //dprintf(("CNV_16_S_TO_16_U_ST_MN"));
         break;
 
@@ -735 +735 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,2);   //factor 0.25
         pConfigInfo->pfnConvert = Convert16UnsignedTo8UnsignedStereoMono;
-        dprintf(("CNV_16_U_TO_8_U_ST_MN"));
+        //dprintf(("CNV_16_U_TO_8_U_ST_MN"));
         break;
 
@@ -741 +741 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,2);   //factor 0.25
         pConfigInfo->pfnConvert = Convert16UnsignedTo8SignedStereoMono;
-        dprintf(("CNV_16_U_TO_8_S_ST_MN"));
+        //dprintf(("CNV_16_U_TO_8_S_ST_MN"));
         break;
 
@@ -747 +747 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,2);   //factor 0.25
         pConfigInfo->pfnConvert = Convert16SignedTo8SignedStereoMono;
-        dprintf(("CNV_16_S_TO_8_S_ST_MN"));
+        //dprintf(("CNV_16_S_TO_8_S_ST_MN"));
         break;
 
@@ -753 +753 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,2);   //factor 0.25
         pConfigInfo->pfnConvert = Convert16SignedTo8UnsignedStereoMono;
-        dprintf(("CNV_16_S_TO_8_U_ST_MN"));
+        //dprintf(("CNV_16_S_TO_8_U_ST_MN"));
         break;
 
@@ -826 +826 @@
         return TRUE;
     }
-    if(pConfigInfo->fSampleRateConversion) 
+    if(pConfigInfo->fSampleRateConversion)
     {
         pConfigInfo->ulHwSampleRate = pConfigInfo->ulFixedSampleRate;
@@ -1062 +1062 @@
     }
 
-    if(pCaps->ulOperation == OPERATION_PLAY) 
+    if(pCaps->ulOperation == OPERATION_PLAY)
     {
          pWaveCaps = &devCaps[ulDeviceNr].waveOutCaps;
@@ -1071 +1071 @@
     if (pCaps->ulChannels != 1 && pCaps->ulChannels != 2)
     {
-        if(pCaps->ulChannels > pWaveCaps->ulMaxChannels) 
+        if(pCaps->ulChannels > pWaveCaps->ulMaxChannels)
         {
             dprintf(("DevCaps1 not channel"));
@@ -1078 +1078 @@
         }
     }
-    if (pCaps->ulSamplingRate == 0) 
+    if (pCaps->ulSamplingRate == 0)
     {
         dprintf(("DevCaps1 not rate"));
@@ -1134 +1134 @@
             break;
         case 24:
-            if(!(pWaveCaps->ulDataFormats & OSS32_CAPS_PCM_FORMAT_24BPS)) 
+            if(!(pWaveCaps->ulDataFormats & OSS32_CAPS_PCM_FORMAT_24BPS))
             {
                 dprintf(("DevCaps1 not 24BPS"));
@@ -1142 +1142 @@
             break;
         case 32:
-            if(!(pWaveCaps->ulDataFormats & OSS32_CAPS_PCM_FORMAT_32BPS)) 
+            if(!(pWaveCaps->ulDataFormats & OSS32_CAPS_PCM_FORMAT_32BPS))
             {
                 pCaps->ulSupport = UNSUPPORTED_BPS;
@@ -1164 +1164 @@
     case DATATYPE_RIFF_ALAW:
     case A_LAW:
-        if(!(pWaveCaps->ulDataFormats & OSS32_CAPS_PCM_FORMAT_ALAW)) 
+        if(!(pWaveCaps->ulDataFormats & OSS32_CAPS_PCM_FORMAT_ALAW))
         {
             dprintf(("DevCaps1 not ALAW"));
@@ -1171 +1171 @@
         }
         // supported bits per sample are 8 (for unsigned PCM, u-law or A-law )
-        if (pCaps->ulBitsPerSample != 8) 
+        if (pCaps->ulBitsPerSample != 8)
         {
             dprintf(("DevCaps1 not ALAW BPS8"));
@@ -1184 +1184 @@
     case DATATYPE_RIFF_MULAW:
     case MU_LAW:
-        if(!(pWaveCaps->ulDataFormats & OSS32_CAPS_PCM_FORMAT_MULAW)) 
+        if(!(pWaveCaps->ulDataFormats & OSS32_CAPS_PCM_FORMAT_MULAW))
         {
             dprintf(("DevCaps1 not MULAW"));
@@ -1191 +1191 @@
         }
         // supported bits per sample are 8 (for unsigned PCM, u-law or A-law )
-        if (pCaps->ulBitsPerSample != 8) 
+        if (pCaps->ulBitsPerSample != 8)
         {
             dprintf(("DevCaps1 not MULAW BPS8"));
@@ -1203 +1203 @@
     case DATATYPE_ADPCM_AVC:
     case DATATYPE_CT_ADPCM:
-        if(!(pWaveCaps->ulDataFormats & OSS32_CAPS_PCM_FORMAT_ADPCM)) 
+        if(!(pWaveCaps->ulDataFormats & OSS32_CAPS_PCM_FORMAT_ADPCM))
         {
             dprintf(("DevCaps1 not ADPCM"));
@@ -1210 +1210 @@
         }
         // supported bits per sample are 4
-        if (pCaps->ulBitsPerSample != 4) 
+        if (pCaps->ulBitsPerSample != 4)
         {
             dprintf(("DevCaps1 not ADPCM BPS4"));
@@ -1430 +1430 @@
 #endif
 
-    if(OSS16_WaveStop(StreamId) != OSSERR_SUCCESS) 
+    if(OSS16_WaveStop(StreamId) != OSSERR_SUCCESS)
     {
         DebugInt3();
@@ -1436 +1436 @@
     }
     //Reset cleans up waveout instance
-    if(OSS16_WaveReset(StreamId) != OSSERR_SUCCESS) 
+    if(OSS16_WaveReset(StreamId) != OSSERR_SUCCESS)
     {
         DebugInt3();

OCO/trunk/drv16/waveplay.cpp

@@ -189 +189 @@
     }
 #ifdef DEBUG
-    dprintf(("WAVEPLAY::ConfigDev1 SampleRate %ld", pConfigInfo->ulHwSampleRate));
-    dprintf(("ulFirstBufSize %ld", ulFirstBufSize));
-    dprintf(("ulFragsize %ld", pConfigInfo->ulFragsize));
+    dprintf(("WAVEPLAY::ConfigDev SampleRate %ld", pConfigInfo->ulHwSampleRate));
+    dprintf(("WAVEPLAY::ConfigDev ulFirstBufSize=%lx ulFragsize=%lx", ulFirstBufSize, pConfigInfo->ulFragsize));
 #endif
 
@@ -197 +196 @@
     {
         ulFirstBufSize = pConfigInfo->ulFragsize; //no conversion required (see below)
-        if (ulFirstBufSize == 0) 
+        if (ulFirstBufSize == 0)
         {
             DebugInt3();
@@ -206 +205 @@
         }
     }
-    else 
+    else
     {
         //convert size of first buffer
         ulFirstBufSize = ConvertLength(ulFirstBufSize, pConfigInfo);
 #ifdef DEBUG
-        dprintf(("ulFirstBufSize %ld", ulFirstBufSize));
+        dprintf(("ulFirstBufSize %lx", ulFirstBufSize));
 #endif /* DEBUG */
     }
@@ -223 +222 @@
     ulPCMConsumeRate = ConvertLength(pConfigInfo->ulPCMConsumeRate, pConfigInfo);
 #ifdef DEBUG
-    dprintf(("cons rate %ld buf size %ld init rate %ld", ulPCMConsumeRate, ulFirstBufSize, pConfigInfo->ulHwSampleRate));
+    dprintf(("cons rate %lx buf size %lx init rate %ld", ulPCMConsumeRate, ulFirstBufSize, pConfigInfo->ulHwSampleRate));
 #endif /* DEBUG */
 
@@ -237 +236 @@
     {
         while(minimumsize < fragsize) fragsize = fragsize / 2; //
- 
+
             if(fragsize < ulPCMConsumeRate/256)
             {//lower limit; don't accept extremely small buffers
@@ -252 +251 @@
 
 #ifdef DEBUG
-    dprintf(("fragsize %ld", fragsize));
+    dprintf(("fragsize %lx", fragsize));
 #endif
     hwparam.ulSampleRate    = pConfigInfo->ulHwSampleRate;
@@ -288 +287 @@
 
 #ifdef DEBUG
-//    dprintf(("WAVEPLAY::Transfer %ld",ulBytesToTransfer));
+    //dprintf(("WAVEPLAY::Transfer %ld",ulBytesToTransfer));
 #endif
 
@@ -319 +318 @@
         }
     }
-    else 
-    {
-        if(pConfigInfo->pfnConvert) 
+    else
+    {
+        if(pConfigInfo->pfnConvert)
         {
             ULONG ulCvtBufferSize;
@@ -332 +331 @@
             ulBytesToTransfer = CONVERT_LENGTH(ulCvtBufferSize, CONVERSION_INVERT(pConfigInfo->ulConversionFactor));
 
-            if(ulBytesToTransfer & (pConfigInfo->ulSampleSize-1)) 
+            if(ulBytesToTransfer & (pConfigInfo->ulSampleSize-1))
             {
                 dprintf(("Transfer New ulBr %ld" , ulBytesToTransfer));
@@ -349 +348 @@
             //convert back from conversion to 'real'
             *pulBytesTransferred = CONVERT_LENGTH(*pulBytesTransferred, CONVERSION_INVERT(pConfigInfo->ulConversionFactor));
-            if(*pulBytesTransferred & (pConfigInfo->ulSampleSize-1)) 
+            if(*pulBytesTransferred & (pConfigInfo->ulSampleSize-1))
             {
 #ifdef DEBUG
@@ -357 +356 @@
             }
         }
-        else 
+        else
         {
             dprintf(("Transfer Zero pConfigInfo->pfnConvert"));
@@ -374 +373 @@
     OSSRET rc;
     ULONG  Space;
-    ULONG i;
 //    if (!waveOpened) return TRUE;
 
@@ -398 +396 @@
         ulCvtBufferSize &= ~(pConfigInfo->ulHwSampleSize - 1);
 
-        if(ulCvtBufferSize == 0) 
+        if(ulCvtBufferSize == 0)
         {
             *pulBytesTransferred = ulBytesToTransfer;
-            if(pConfigInfo->ulSRatePosition >= pConfigInfo->ulSRateIncrement) 
+            if(pConfigInfo->ulSRatePosition >= pConfigInfo->ulSRateIncrement)
             {
                 pConfigInfo->ulSRatePosition -= pConfigInfo->ulSRateIncrement;
@@ -423 +421 @@
                 ulCvtBufferSize = Space & ~(pConfigInfo->ulHwSampleSize - 1);
         }
-        if ((rc = OSS16_WaveAddBuffer(StreamId, pConfigInfo->pSRateConvBuffer, ulCvtBufferSize, pulBytesTransferred)) != OSSERR_SUCCESS 
+        if ((rc = OSS16_WaveAddBuffer(StreamId, pConfigInfo->pSRateConvBuffer, ulCvtBufferSize, pulBytesTransferred)) != OSSERR_SUCCESS
              ||  *pulBytesTransferred == 0)
         {
-            if(rc == OSSERR_BUFFER_FULL) 
+            if(rc == OSSERR_BUFFER_FULL)
             {
                  GetSpace(StreamId, pConfigInfo, &Space);
@@ -432 +430 @@
             }
 #ifdef DEBUG
-            else 
+            else
                 dprintf(("WPLAY::AddBuffer; %ld rc=%x failed", ulCvtBufferSize, (USHORT)rc));
 #endif
@@ -452 +450 @@
         // if the last sample is still needed for the next run, then adjust sample count and
         // sample rate conversion position
-        if(lSRatePosition < 0) 
+        if(lSRatePosition < 0)
         {
             dprintf4(("WAVEPLAY::AddBuffer; sratepos < 0"));
@@ -458 +456 @@
             pConfigInfo->ulSRatePosition = 0;
         }
-        else 
+        else
         {
             pConfigInfo->ulSRatePosition = (ULONG)lSRatePosition;
@@ -507 +505 @@
 //    if (!waveOpened) return TRUE;
 
-    if(OSS16_WaveGetSpace(StreamId, &space) != OSSERR_SUCCESS) 
+    if(OSS16_WaveGetSpace(StreamId, &space) != OSSERR_SUCCESS)
     {
         *pulStreamSpace = 0;
@@ -529 +527 @@
     ULONG space,cvt;
 
-    if(OSS16_WaveGetHwPtr(StreamId, &space) != OSSERR_SUCCESS) 
+    if(OSS16_WaveGetHwPtr(StreamId, &space) != OSSERR_SUCCESS)
     {
         *pulHwPtr = 0;

OCO/trunk/drv16/waverec.cpp

@@ -139 +139 @@
     hwparam.ulDataType      = QueryOSSDataFormat(OPERATION_RECORD, pConfigInfo->ulDataType, pConfigInfo->ulHwBitsPerSample);
     if(OSS16_WaveSetFormat(StreamId, &hwparam) != OSSERR_SUCCESS) {
+                dprintf(("WAVEREC::ConfigDev: WaveSetFormat failed"));
         DebugInt3();
         return FALSE;
@@ -151 +152 @@
                        ULONG FAR *pulBytesTransferred)
 {
+#ifdef DEBUG
+    //dprintf(("WAVEREC::Transfer %lx bytes", ulBytesToTransfer));
+#endif
     if(pConfigInfo->usConversion == CONVERT_NONE)
     {

OCO/trunk/drv16/wavestrm.cpp

@@ -40 +40 @@
 #endif
 
+extern "C" ULONG  __cdecl __saveregs OSSIDC_EntryPoint(ULONG cmd, ULONG param1, ULONG param2);
+
 
 //******************************************************************************
@@ -50 +52 @@
 // the data has been played and 1 if there is still some data left.
 //******************************************************************************
-USHORT  WAVESTREAM::_vRealignBuffer(ULONG endpos, PSTREAMBUFFER pbuffer)
-{
-   ULONG streambuf_start, bufconsumed;
-   USHORT usRC;
-
-   streambuf_start = pbuffer->ulDonepos - pbuffer->ulBuffpos;
-      // if none of the data in this stream buffer has been consumed
-   if (endpos <= streambuf_start) {
-      pbuffer->ulDonepos = 0;
-      pbuffer->ulBuffpos = 0;
-      usRC = 1;
-   }
-     // else some or all of the data has been consumed
-   else {
-      bufconsumed = endpos - streambuf_start;
-        // some of the buffer has been consumed
-      if (bufconsumed <= pbuffer->ulBuffsz) {
-         pbuffer->ulDonepos = 0;
-         pbuffer->ulBuffpos = pbuffer->ulBuffsz - bufconsumed;
-         pbuffer->ulBuffpos &= 0xFFFFFFFC; //keep it on a dword boundary
-         usRC = 1;
-      }
-        // all of the buffer has been consumed
-      else {
-         pbuffer->ulDonepos = 0;
-         pbuffer->ulBuffpos = pbuffer->ulBuffsz;
-         usRC = 0;
-      }
-   }
-   return(usRC);
+USHORT  WAVESTREAM::_vRealignBuffer(ULONG ulEndPos, PSTREAMBUFFER pBuffer)
+{
+        if (ulEndPos >= pBuffer->ulDonepos) { /* all of the data has been consumed */
+                pBuffer->ulBuffpos = pBuffer->ulBuffsz;
+                pBuffer->ulDonepos = 0;
+                return(0);
+        }
+
+        if (ulEndPos >= (pBuffer->ulDonepos - pBuffer->ulBuffpos)) { /* some of the data has been consumed */
+                pBuffer->ulBuffpos = pBuffer->ulDonepos - ulEndPos;
+                pBuffer->ulBuffpos &= 0xFFFFFFFC; //keep it on a dword boundary
+                pBuffer->ulDonepos = 0;
+                return(1);
+        }
+        /* none of the data in this buffer has been consumed */
+        pBuffer->ulDonepos = 0;
+        pBuffer->ulBuffpos = 0;
+        return(1);
 }
 
@@ -99 +89 @@
 // and put the STREAMBUFFER on the Head queue.
 //******************************************************************************
-void WAVESTREAM::_vRealignPausedBuffers(ULONG endpos)
-{
-   PQUEUEHEAD pTempHead = new QUEUEHEAD;
-   PSTREAMBUFFER ptempbuff;
-   USHORT usRC;
-
-
-   switch (ulStreamType & STREAM_WRITE) {
-   case STREAM_READ:
-      _vReadAudioBuf();
-      break;
-
-   case STREAM_WRITE:
-
-      // if there is a buffer on the InProcess Queue
-      // only check the first one as any others are just waiting.....
-      if (qhInProcess.IsElements()) 
-      {
-           // if any data has been written from this stream buffer
-         ptempbuff = (PSTREAMBUFFER)qhInProcess.Head();
-         if (ptempbuff->ulDonepos) 
-         {
-             _vRealignBuffer(endpos, ptempbuff);
-         }  /* end if ulDonepos */
-      }
-
-      // if there are bufferes on the done queue, pop them off the head and
-      // push them on the head of qhTempHead.  This will reorder them so
-      // that the more recently used ones will be in the front of the queue.
-      // Pass them all to _vRealignBuffer. If the rc from _vRealignBuffer is
-      // 0 then there is no unprocessed data in the buffer (it is ready to
-      // be returned) so put it on the Tail of the done queue.
-      // If the rc is 1 then put it on the head of the InProcess queue.
-
-      while (qhDone.IsElements()) 
-      {
-         pTempHead->PushOnHead(qhDone.PopHead());
-      } /* endwhile */
-
-      while (pTempHead->IsElements()) 
-      {
-         usRC = _vRealignBuffer(endpos, (PSTREAMBUFFER)pTempHead->Head());
-         if (usRC)
-           qhInProcess.PushOnHead(pTempHead->PopHead());
-         else
-           qhDone.PushOnTail(pTempHead->PopHead());
-      } /* endwhile */
-      break;
-   default:
-      break;
-   } /* endswitch */
-   delete pTempHead; // free the memory this ain't no Java here !!
+void WAVESTREAM::_vRealignPausedBuffers(ULONG ulEndPos)
+{
+        PQUEUEHEAD pTempHead = new QUEUEHEAD;
+        PSTREAMBUFFER pTmpBuf;
+        USHORT usRC;
+
+
+        switch (ulStreamType & STREAM_WRITE) {
+        case STREAM_READ:
+                _vReadAudioBuf();
+                break;
+
+        case STREAM_WRITE:
+
+                // if there is a buffer on the InProcess Queue
+                // only check the first one as any others are just waiting.....
+                if (qhInProcess.IsElements())
+                {
+                        // if any data has been written from this stream buffer
+                        pTmpBuf = (PSTREAMBUFFER)qhInProcess.Head();
+                        if (pTmpBuf->ulDonepos)
+                        {
+                                _vRealignBuffer(ulEndPos, pTmpBuf);
+                        }
+                }
+
+                // if there are buffere on the done queue, pop them off the head and
+                // push them on the head of qhTempHead.  This will reorder them so
+                // that the more recently used ones will be in the front of the queue.
+                // Pass them all to _vRealignBuffer. If the rc from _vRealignBuffer is
+                // 0 then there is no unprocessed data in the buffer (it is ready to
+                // be returned) so put it on the Tail of the done queue.
+                // If the rc is 1 then put it on the head of the InProcess queue.
+
+                while (qhDone.IsElements()) {
+                        pTempHead->PushOnHead(qhDone.PopHead());
+                }
+
+                while (pTempHead->IsElements())
+                {
+                        usRC = _vRealignBuffer(ulEndPos, (PSTREAMBUFFER)pTempHead->Head());
+                        if (usRC)
+                                qhInProcess.PushOnHead(pTempHead->PopHead());
+                        else
+                                qhDone.PushOnTail(pTempHead->PopHead());
+                }
+                while (qhDone.IsElements()) {
+                        ReturnBuffer();
+                }
+                break;
+        default:
+                break;
+        } /* endswitch */
 }
 
@@ -163 +154 @@
 #pragma on (unreferenced)
 {
-    ULONG space, byteswritten, curspace,i;
-
-//    dgprintf(("AddBuffers %d",fFirst == TRUE?1:2));
-
-    byteswritten = 0;
-    if (ulStreamType & STREAM_WRITE) 
+    ULONG ulSpace, ulBytesWritten;
+        ULONG ulDAZ;
+
+        //dgprintf(("WS:AddBuffers First=%d, SampleSize=%lx", fFirst, _configinfo.ulSampleSize));
+
+    ulBytesWritten = 0;
+    if (ulStreamType & STREAM_WRITE)
     {
         // get the space available in the hardware buffer
@@ -175 +167 @@
         // could keep us in this loop writing 4 or 8 bytes at a time.
         // In extream cases we will stay stuck in this loop long enough to casue a trap rjj
-         if (pahw->GetSpace(StreamId, &_configinfo, &space) == FALSE) 
+                if (pahw->GetSpace(StreamId, &_configinfo, &ulSpace) == FALSE)
         {
-//            dgprintf(("WAVESTREAM::AddBuffers Error 1"));
+                        dgprintf(("WAVESTREAM::AddBuffers GetSpace failed"));
             return;
         }
-        space &= (~(_configinfo.ulSampleSize - 1));
-//        curspace = min(space, _configinfo.ulBytesPerIRQ/_configinfo.ulSampleSize * 2);
-        curspace = space;
-        while (space && qhInProcess.IsElements()) 
+        ulSpace &= (~(_configinfo.ulSampleSize - 1));
+                ulDAZ = 0;
+        while (ulSpace && qhInProcess.IsElements())
         {
-            // Fisrt time going in task time
-            // for I7 need give time for interrupt time
-            if (fFirst == TRUE)  //PS+++
-            {
-                cli();
-//                 DevHelp_ProcBlock (space, 20, 0);
-            }
-//            dgprintf(("AddBuffers write %ld SSize:%ld %d",space, _configinfo.ulSampleSize, fFirst == TRUE?1:2));
-            byteswritten = AddBuffer(space > curspace? curspace: space);
-            if (pahw->GetSpace(StreamId, &_configinfo, &curspace) == FALSE) 
-            {
-//                dgprintf(("WAVESTREAM::AddBuffers Error 2"));
-                break;
-            }
-            if(byteswritten == (ULONG)-1)
-                break;
-            if (!curspace)
-            {
-                curspace = _configinfo.ulSampleSize;
-            }
-            space -= byteswritten;
-            space &= ( ~(_configinfo.ulSampleSize - 1));
-        }
-
-    }
-//    dgprintf(("AddBuffers %d End",fFirst == TRUE?1:2));
-}
+                        if (ulDAZ++ > 20) {
+                                dgprintf(("WAVESTREAM::AddBuffers DAZ break")); // Temporary hack to prevent lockups when uniaud32 stops (underrun)
+                                break;
+                        }
+                // First time is in task time. For I7 need to give time for interrupt time
+                if (fFirst == TRUE)  //PS+++
+            {
+                                //cli();
+                    DevHelp_ProcBlock (0x5541, 20, 0); // ok since the first call is at task time
+                ulBytesWritten = AddBuffer(ulSpace);
+                                return;
+                        }
+            ulBytesWritten = AddBuffer(ulSpace);
+            if (ulBytesWritten == (ULONG)-1) break;
+            ulSpace -= ulBytesWritten;
+            ulSpace &= ( ~(_configinfo.ulSampleSize - 1));
+        }
+
+    }
+}
+
 //******************************************************************************
 // write one buffer to the audio buffer                                           1
@@ -218 +203 @@
 // there are buffers on pHead... BEWARE
 //******************************************************************************
-ULONG WAVESTREAM::AddBuffer(ULONG space)
+ULONG WAVESTREAM::AddBuffer(ULONG ulSpace)
 {
     PSTREAMBUFFER pTemp = (PSTREAMBUFFER)qhInProcess.Head();
-    ULONG pdataBuf;
-    ULONG Buff_left, byteswritten, start_pos;
-
-//    ddprintf(("AddBuffer"));
-    // make sure we have a buffer to copy from.....
-    if (!pTemp) 
+    ULONG pDataBuf;
+    ULONG ulBuffLeft;
+        ULONG ulBytesWritten;
+        ULONG ulStartPos;
+
+    /* make sure we have a buffer to copy from */
+    if (!pTemp)
     {
         return (ULONG)-1;
     }
 
-    // get the starting position. Call WaveGetHwPtr. if we get a bad rc
-    // then we bail out.
-    if(pahw->GetHwPtr(StreamId, &_configinfo, &start_pos) == FALSE)
+        /* make sure there is space in the output buffer */
+    if (!ulSpace)
+    {
+        return (ULONG)-1;
+    }
+
+        /* PS+++ if input buffer is ZERO do nothing and ask for give new buffer, See REMARK in mmpm2.inf */
+    if (!pTemp->ulBuffsz)
+    {
+        qhDone.PushOnTail(qhInProcess.PopHead());
+        return (ULONG)-1;
+    }
+
+    // get the starting position. Call WaveGetHwPtr. if we get a bad rc then we bail out.
+    if(pahw->GetHwPtr(StreamId, &_configinfo, &ulStartPos) == FALSE)
     {
         dgprintf(("WAVESTREAM::AddBuffer Err in GetHwPtr"));
@@ -240 +238 @@
     }
 
-    if (!pTemp->ulBuffsz || !space)
-    {
-        dgprintf(("WAVESTREAM::AddBuffer 0, Bufsz:%ld Space:%ld",pTemp->ulBuffsz, space));
-        //PS+++ if is ZERO do nothing and ask for give new buffer, See REMARK in mmpm2.inf
+    // get the buffer pointer and amount of data remaining
+    pDataBuf  = (ULONG)pTemp->pBuffptr + pTemp->ulBuffpos; /* points to the beginning of data in src buffer */
+    ulBuffLeft = pTemp->ulBuffsz - pTemp->ulBuffpos; /* amount of src data left to transfer */
+    //dgprintf(("WS::AddBuffer buf=%lx remain=%lx, space=%lx bp=%lx dp=%lx size=%lx", pTemp->pBuffptr, ulBuffLeft, ulSpace, pTemp->ulBuffpos, pTemp->ulDonepos, pTemp->ulBuffsz));
+    ulBuffLeft = min(ulBuffLeft, ulSpace); /* the smaller of src data left or dst space available */
+
+    if (pahw->Transfer(StreamId, &_configinfo, pDataBuf, ulBuffLeft, &ulBytesWritten) == FALSE)
+    {
+                // This could mean that the hardware has underrun TODO: implement underrun logic
+        dgprintf(("WS::AddBuffer: pahw->Transfer failed"));
+        return (ULONG)-1;
+    }
+    if (ulBytesWritten == 0)
+    {
+                // This could mean that the hardware has underrun TODO: implement underrun logic
+        dgprintf(("WS::AddBuffer: 0 of %lx bytes written by transfer", ulBuffLeft));
+                return (ULONG)-1; /* DAZ check into returning zero, returning 0 may cause lockup */
+    }
+        //dgprintf(("WS::AddBuffer added %lx from %lx BuffPos=%lx sz=%lx bw=%lx dp=%lx", ulBytesWritten, pTemp->pBuffptr, pTemp->ulBuffpos, pTemp->ulBuffsz, _ulBytesWritten, pTemp->ulDonepos));
+
+        _ulBytesWritten += ulBytesWritten; /* update the running counter */
+    pTemp->ulBuffpos += ulBytesWritten; /* update the buffer pos counter */
+    pTemp->ulDonepos = _ulBytesWritten; /* update the done Position for returning the buffer */
+
+    // check to see if the whole buffer has been copied and needs to be put on the done queue
+    if (pTemp->ulBuffpos >= (pTemp->ulBuffsz /* & 0xFFFFFFFC*/)) /* DAZ */
+    {
+                //dgprintf(("WS::AddBuffer done with buffer %lx dp=%lx", pTemp->pBuffptr, pTemp->ulDonepos));
         qhDone.PushOnTail(qhInProcess.PopHead());
-//        DebugInt3();
-        return -1;
-    }
-    // get the buffer pointer and amount of data remaining
-    pdataBuf  = (ULONG)pTemp->pBuffptr + pTemp->ulBuffpos;
-    Buff_left = pTemp->ulBuffsz - pTemp->ulBuffpos;
-    Buff_left = min(Buff_left, space);
-
-    if (pahw->Transfer(StreamId, &_configinfo, pdataBuf, Buff_left, &byteswritten) == FALSE) 
-    {
-        dgprintf(("AddBuffer: pahw->Transfer failed!!"));
-//        DebugInt3();
-        return (ULONG)-1;
-    }
-    if (byteswritten == 0) 
-    {
-        dgprintf(("AddBuffer: No more room!!"));
-//        DebugInt3();
-//PS+++        return (ULONG)-1; //no more room
-        return 0;   //PS+++ may be in next time?
-    }
-    // update the buffer pos counter
-    pTemp->ulBuffpos += byteswritten;
-
-    // update the done Position
-    pTemp->ulDonepos = start_pos + byteswritten;
-
-    // check to see if the buffer has been copied and needs to be put on the done queue
-    if (pTemp->ulBuffpos >= (pTemp->ulBuffsz & 0xFFFFFFFC)) 
-    {
-        qhDone.PushOnTail(qhInProcess.PopHead());
-    }
-//    dgprintf(("WV::AddBuffer sz %lx, bywr %lx dp %lx", Buff_left, byteswritten,pTemp->ulDonepos));
-    return byteswritten;
+    }
+    return ulBytesWritten;
 }
 //******************************************************************************
@@ -287 +277 @@
 {
     PSTREAMBUFFER pTemp = (PSTREAMBUFFER)qhInProcess.Head();
-    ULONG pdataBuf;
-    ULONG Buff_left, bytesread;
-
-    if(!pTemp)
-        return FALSE;
+    ULONG pDataBuf;
+    ULONG ulBuffLeft, ulBytesRead;
+
+    if(!pTemp) return FALSE;
 
     // get the buffer pointer and amount of data remaining
-    pdataBuf  = (ULONG)pTemp->pBuffptr + pTemp->ulBuffpos;
-    Buff_left = pTemp->ulBuffsz - pTemp->ulBuffpos;
+    pDataBuf  = (ULONG)pTemp->pBuffptr + pTemp->ulBuffpos;
+    ulBuffLeft = pTemp->ulBuffsz - pTemp->ulBuffpos;
 
     // read wave data
-    if(pahw->Transfer(StreamId, &_configinfo, pdataBuf, Buff_left, &bytesread) == FALSE) 
-    {
-       dprintf(("_vReadAudioBuf: pahw->Transfer failed!!"));
-       return FALSE;
-    }
-    if(bytesread == 0) {
-       return FALSE; //no more data
-    }
-
-//    dprintf4(("_vReadAudioBuf %lx size %ld, bytes read %ld", pdataBuf, Buff_left, bytesread));
+    if(pahw->Transfer(StreamId, &_configinfo, pDataBuf, ulBuffLeft, &ulBytesRead) == FALSE)
+    {
+       return FALSE; /* No more data */
+    }
+    if(ulBytesRead == 0) {
+       return FALSE; /* No more data */
+    }
+        if (ulBytesRead > ulBuffLeft) {
+       return FALSE; /* Internal error */
+        }
 
     // update the buffer pos counter
-    pTemp->ulBuffpos  += bytesread;
-    _ulBytesProcessed += bytesread;
+    pTemp->ulBuffpos  += ulBytesRead;
+    _ulBytesProcessed += ulBytesRead;
+
+        //dprintf(("_vReadAudioBuf %lx Requested=%lx Read=%lx Remain=%lx Processed=%lx", pDataBuf, ulBuffLeft, ulBytesRead, pTemp->ulBuffsz-pTemp->ulBuffpos, _ulBytesProcessed));
 
     if(pTemp->ulBuffpos == pTemp->ulBuffsz) {
         qhDone.PushOnTail(qhInProcess.PopHead());
             ReturnBuffer();
-            dprintf(("_vReadAudioBuf return buffer %lx size %ld, bytes read %ld position %ld", (ULONG)pTemp->pBuffptr, pTemp->ulBuffsz, bytesread, _ulBytesProcessed));
     }
 
@@ -328 +318 @@
 // can be returned and finally process any events pending.
 //******************************************************************************
-USHORT ProcNumber = 0;
 void DBGCALLCONV WAVESTREAM::Process(void)
 {
- PSTREAMBUFFER ptemp;
- ULONG         ulCurBytesProcessed = 0;
- USHORT        CurProcNumber = ProcNumber++;
- ULONG         space;
-
-#ifdef DEBUG
-//    ddprintf(("WAVESTREAM::Process %d",CurProcNumber));
-#endif
+        PSTREAMBUFFER pTemp;
+        ULONG   ulBytes;
+        ULONG ulDAZ;
+
+        //ddprintf(("WAVESTREAM::Process Start"));
 
     // get the stream position. if we get a bad rc or the position is 0
@@ -344 +330 @@
     // GetPostiion returns the adjusted hw pointer from the ALSA status ioctl
     // This is really a running total of bytes consumed by the hardware.
-    if(pahw->GetPosition(StreamId, &_configinfo, &ulCurBytesProcessed) == FALSE)
+        // DAZ - Note that this is a 32 bit counter and will wrap at sometime. ALSA
+        // attempts to wrap this counter intelligently. I haven't determined what
+        // effect, if any, the wrapping of this counter will have playing a stream.
+    if(pahw->GetPosition(StreamId, &_configinfo, &ulBytes) == FALSE)
     {
         ddprintf(("Error No bytes processed"));
@@ -350 +339 @@
         return;
     }
-//    ddprintf(("StPos: %lx", ulCurBytesProcessed));
-    // save the bytes processed in the stream object
-    _ulBytesProcessed = ulCurBytesProcessed;
-
-    switch (ulStreamType & STREAM_WRITE) 
-    {
-
-        // if there are buffers that have been completly written to the audio buffer
-        // check the first one on the done queue
-        // if it's data has been consumed by the hardware return it.
-        //
-        // Bug #18 Sometimes MMPM gives us really small buffers. If we
-        // wait for the buffer to be completly consumed and there is a tiny buffer
-        // on the queue after this one, the sound part could underrun before we get a
-        // chance to refill it. To fix this we will return the buffer if it will be
-        // consumed before the next call to WAVESTREAM:Process().
-        // rjj Fix for Bug #18 28082008
+    _ulBytesProcessed = ulBytes;
+
+    switch (ulStreamType & STREAM_WRITE)
+    {
         case STREAM_WRITE:
-        {
-            if (qhDone.IsElements()) 
+            if (qhInProcess.IsElements())
             {
-                ptemp = (PSTREAMBUFFER)qhDone.Head();
-                while ((_ulBytesProcessed + _configinfo.ulBytesPerIRQ) >= ptemp->ulDonepos)
-                {
-                    ReturnBuffer();
-                    ptemp = (PSTREAMBUFFER)qhDone.Head();
-                }
+                                AddBuffers(FALSE);
             }
-            if ((pahw->GetSpace(StreamId, &_configinfo, &space) != FALSE) 
-               && qhInProcess.IsElements())
-            {
-               AddBuffers(FALSE);
-            }
-
-        break;
-
-        }
+                // Return any buffers that have been completely written to uniaud32
+                        while (qhDone.IsElements()) {
+                pTemp = (PSTREAMBUFFER)qhDone.Head(); /* get a pointer to the first completed buffer */
+                                // Hang on to the last buffer until the hardware is done writing the data
+                                // We do this because MMPM uses the return of the last buffer to determine when we are
+                                // done playing the stream
+                                if ((qhDone.Head() == qhDone.Tail()) && !qhInProcess.IsElements() && (_ulBytesProcessed < pTemp->ulDonepos)) break; /* only one buffer left */
+                                ReturnBuffer();
+                        }
+                break;
         case STREAM_READ:
-            while(_vReadAudioBuf());
-            break;
+                        ulDAZ = 0;
+                    while(_vReadAudioBuf()) {
+                                if (ulDAZ++ > 20) { /* temporary hack to prevent hangs when uniaud32 stops (overruns) */
+                                ddprintf(("WAVESTREAM::Process Read DAZ Break"));
+                                        break;
+                                }
+                        }
+                    break;
         default:
             break;
@@ -395 +372 @@
 
     ProcessEvents();
-//    ddprintf(("WAVESTREAM::Process %d End",CurProcNumber));
+    //ddprintf(("WAVESTREAM::Process End"));
 }
 //******************************************************************************
@@ -404 +381 @@
 {
     PSTREAMBUFFER pStreamBuf = new STREAMBUFFER(uLength, pbuf);
- 
+
     return Write(pStreamBuf);
 }
@@ -420 +397 @@
 {
     qhInProcess.PushOnTail((PQUEUEELEMENT)new STREAMBUFFER(uLength, pbuf));
-//    dprintf2(("WAVESTREAM::Read: Push on tail %lx %d", pbuf, uLength));
+    //dprintf2(("WAVESTREAM::Read: Push on tail %lx %lx", pbuf, uLength));
     return 0;
 }
@@ -441 +418 @@
     ULONG Seconds, MilliSeconds, Overflow, Processed;
 
-//PS++ optimize code
+        //PS++ optimize code
     Processed = _ulBytesProcessed;
     if (ulStreamState == STREAM_STREAMING)  // if the stream is active
@@ -449 +426 @@
            if (pahw->GetPosition(StreamId, &_configinfo, &Processed) == FALSE)
            {
-//                DebugInt3();
+                                //DebugInt3();
                 Processed = _ulBytesProcessed; //last known position
            }
@@ -455 +432 @@
     }
 
-    // if we haven't processed anything then just return
-    // _ulTimeBase
+    // if we haven't processed anything then just return _ulTimeBase
     if(Processed == 0)
         return(_ulTimeBase);
@@ -470 +446 @@
 ULONG WAVESTREAM::GetCurrentPos(void)
 {
-    ULONG Processed;
-
-//PS++ optimize code
-    Processed = _ulBytesProcessed;
-    if (ulStreamState == STREAM_STREAMING)  // if the stream is active
-    {
-        if (ulStreamType & STREAM_WRITE) 
-       {
-           if (pahw->GetPosition(StreamId, &_configinfo, &Processed) == FALSE)
-           {
-                DebugInt3();
-                Processed = _ulBytesProcessed; //last known position
-           }
+        ULONG Processed;
+
+        //PS++ optimize code
+        Processed = _ulBytesProcessed;
+        if (ulStreamState == STREAM_STREAMING)  // if the stream is active
+        {
+                if (ulStreamType & STREAM_WRITE)
+                {
+                        if (pahw->GetPosition(StreamId, &_configinfo, &Processed) == FALSE)
+                        {
+                                DebugInt3();
+                                Processed = _ulBytesProcessed; //last known position
+                        }
+                }
         }
-    }
-
-    return Processed;
+        return Processed;
 }
 //******************************************************************************
@@ -498 +473 @@
    PSTREAMBUFFER pTemp = (PSTREAMBUFFER)qhDone.Tail();
 
-   if(!pTemp) 
+   if(!pTemp)
    {
        pTemp = (PSTREAMBUFFER)qhInProcess.Head();
    }
-   if(pTemp) 
+   if(pTemp)
    {
        writepos = pTemp->ulBuffpos;
@@ -517 +492 @@
 void  WAVESTREAM::SetCurrentTime(ULONG time)
 {
+        //ddprintf(("SetCurrentTime: %lx", time));
     _ulTimeBase = time;
 }
@@ -525 +501 @@
     PSTREAMBUFFER pTemp = (PSTREAMBUFFER)qhInProcess.Head();
 
-#ifdef DEBUG
-//    ddprintf(("WAVESTREAM::StartStream"));
-#endif
-
-    if(ulStreamState == STREAM_STREAMING) 
+    if(ulStreamState == STREAM_STREAMING)
     {
         ddprintf(("StartStream: already playing!!"));
@@ -537 +509 @@
     // configure the wave device
     // (NOTE: Must call this function; sample rate position is reset there)
-    if(pahw->ConfigDev(StreamId, &_configinfo, (pTemp) ? pTemp->ulBuffsz : 0) == FALSE) 
+    if(pahw->ConfigDev(StreamId, &_configinfo, (pTemp) ? pTemp->ulBuffsz : 0) == FALSE)
     {
         ddprintf(("StartStream: ConfigDev failed!!"));
         return ERROR_INSUFF_BUFFER;
-//        goto fail;
+                //goto fail;
     }
     // prepare wave device for playback/recording
-    if(pahw->Prepare(StreamId) == FALSE) 
+    if(pahw->Prepare(StreamId) == FALSE)
     {
         ddprintf(("StartStream: Prepare failed!!"));
@@ -551 +523 @@
 
     _ulBytesProcessed = 0;
+        _ulBytesWritten = 0;
 
     ulStreamState = STREAM_STREAMING;
     //Adding the first buffer also starts playback
-    if (ulStreamType == STREAM_WAVE_PLAY) 
-    {
-       pahw->SetVolume(StreamId, getMixerStreamId(), volume);    //PS
-        AddBuffers(TRUE);
+    if (ulStreamType == STREAM_WAVE_PLAY)
+    {
+                pahw->SetVolume(StreamId, getMixerStreamId(), volume);    //PS
+                AddBuffers(TRUE);
         //Must set volume after adding buffers (voices inside sblive driver might not
         //be allocated otherwise (first start) )
 //        dprintf(("SetVolume %lx",volume));
 // PS, removing to high
-//       pahw->SetVolume(StreamId, getMixerStreamId(), volume);
-    }
-    else 
-    {
+//      pahw->SetVolume(StreamId, getMixerStreamId(), volume);
+    }
+    else
+    {
+        //dprintf(("Starting Rec Stream"));
         ulSavedInputGain = pahw->QueryVolume(StreamId, getMixerStreamId());
         pahw->SetInputSrc(StreamId, getMixerStreamId(), inputsrc);
         pahw->SetVolume(StreamId, getMixerStreamId(), inputgain);
 
-        if(pahw->Start(StreamId) != TRUE) 
-       {
+                if(pahw->Start(StreamId) != TRUE)
+                {
             dprintf(("pahw->Start failed!!"));
             goto fail;
         }
     }
-//    ddprintf(("WAVESTREAM::StartStream %lx End", StreamId));
     return NO_ERROR;
 
@@ -602 +575 @@
 
     ulStreamState = STREAM_STOPPED;
-//    ddprintf(("WAVESTREAM::StopStream %lx", StreamId));
+        //ddprintf(("WAVESTREAM::StopStream %lx", StreamId));
+
     ReturnBuffers();
     pControl->ulTime = GetCurrentTime();
@@ -610 +584 @@
     // DDCMD_ENABLE_EVENT the event time will get screwed up. rjj
     _ulBytesProcessed = 0;
+        _ulBytesWritten = 0;
     return NO_ERROR;
 }
@@ -616 +591 @@
 ULONG  WAVESTREAM::PauseStream(PCONTROL_PARM pControl)
 {
-    ULONG endpos;
-
-    pahw->GetPosition(StreamId, &_configinfo, &endpos);
+    ULONG ulEndPos, ulEndPos2;
+
+    if(ulStreamState == STREAM_PAUSED) {
+        dprintf(("WAVESTREAM::PauseStream %lx (already paused)", StreamId));
+            pControl->ulTime = GetCurrentTime();
+            return NO_ERROR;
+    }
+
+    pahw->GetPosition(StreamId, &_configinfo, &ulEndPos);
     //silence wave stream before stopping it (removes clicks)
     pahw->SetVolume(StreamId, getMixerStreamId(), 0);
     pahw->Stop(StreamId);
 
+        /* DAZ test code begin */
+    if (pahw->GetPosition(StreamId, &_configinfo, &ulEndPos2) == FALSE) ulEndPos2 = 0;
+        if (ulEndPos2 != ulEndPos) {
+            ddprintf(("WAVESTREAM::PauseStream %lx!=%lx", ulEndPos, ulEndPos2));
+                if (ulEndPos2) ulEndPos = ulEndPos2;
+        }
+        /* DAZ test code end */
+
     ulStreamState = STREAM_PAUSED;
 
     ddprintf(("WAVESTREAM::PauseStream %lx", StreamId));
 
-    _vRealignPausedBuffers(endpos);
-
-    _ulBytesProcessed = endpos;
+    _ulBytesProcessed = ulEndPos;
+
+    _vRealignPausedBuffers(ulEndPos);
+
     pControl->ulTime = GetCurrentTime();
+
     _ulBytesProcessed = 0;
+        _ulBytesWritten = 0;
+
     return NO_ERROR;
 }
@@ -639 +632 @@
 {
 #ifdef DEBUG
-    dprintf(("WAVESTREAM::ResumeStream %lx", StreamId));
+    //dprintf(("WAVESTREAM::ResumeStream %lx", StreamId));
 #endif
     return StartStream();
@@ -647 +640 @@
 BOOL WAVESTREAM::SetProperty(int type, ULONG value, ULONG reserved)
 {
-#ifdef DEBUG
-//    dprintf(("WAVESTREAM::SetProperty"));
-#endif
-
     switch(type) {
     case PROPERTY_VOLUME:
@@ -677 +666 @@
 ULONG WAVESTREAM::GetProperty(int type)
 {
-#ifdef DEBUG
-//    dprintf(("WAVESTREAM::GetProperty"));
-#endif
     switch(type) {
     case PROPERTY_FREQUENCY:
@@ -699 +685 @@
    STREAM(streamtype, filesysnum, mixerStreamId)
 {
-#ifdef DEBUG
-    dprintf(("WS::WS:S"));
-#endif
     // get the pointer to the hardware object
     pahw = (WAVEAUDIO*)GetHardwareDevice(streamtype);
@@ -710 +693 @@
     _configinfo.ulNumChannels   = pinit->sChannels;
     _configinfo.ulDataType      = pinit->sMode;
+    _ulBytesWritten             = 0;
     _ulBytesProcessed           = 0;
     _ulTimeBase                 = 0;
-    //_ulUnderrunBase             = 0;
     ulSavedInputGain            = 0;
 
@@ -746 +729 @@
     pinit->ulFlags |= pahw->QueryDataFlags(pinit->ulOperation, pinit->sMode, pinit->lBitsPerSRate);
 
-    //fUnderrun   = FALSE;
     StreamId    = 0;
 
@@ -755 +737 @@
     }
 
-//    dprintf(("WAVESTREAM stream %lx ctor %lx: rate %d bps %d numchan %d type %x", hstream, StreamId, (USHORT)_configinfo.ulSampleRate, (USHORT)_configinfo.ulBitsPerSample, (USHORT)_configinfo.ulNumChannels, (USHORT)_configinfo.ulNumChannels, (USHORT)_configinfo.ulDataType));
+        //dprintf(("WAVESTREAM stream %lx ctor %lx: rate %d bps %d numchan %d type %x", hstream, StreamId, (USHORT)_configinfo.ulSampleRate, (USHORT)_configinfo.ulBitsPerSample, (USHORT)_configinfo.ulNumChannels, (USHORT)_configinfo.ulNumChannels, (USHORT)_configinfo.ulDataType));
 }
 //******************************************************************************
@@ -761 +743 @@
 WAVESTREAM::~WAVESTREAM()
 {
-//    dprintf(("WAVESTREAM stream %x dtor %lx", hstream, StreamId));
+        //dprintf(("WAVESTREAM stream %x dtor %lx", hstream, StreamId));
     if(_configinfo.pConversionBuffer) {
         if(DevHelp_VMFree(_configinfo.pConversionBuffer) != 0) {

OCO/trunk/drv16/wavestrm.hpp

@@ -61 +61 @@
 
    WaveConfigInfo _configinfo;    // configuration info shared with the hardware
-   ULONG   _ulBytesProcessed;     // number of bytes consumed or produces
+   ULONG   _ulBytesWritten;       // number of bytes transferred to uniaud32
+   ULONG   _ulBytesProcessed;     // number of bytes consumed or produced
    ULONG   _ulTimeBase;           // value in ms. MMPM sends for stream time
 

OCO/trunk/include/dbgos2.h

@@ -19 +19 @@
 #endif
 
+#ifdef DEBUG
 #define dprintf(a)  if(dbglevel >= 1) PrintfOut a
 #define dprintf2(a) if(dbglevel >= 2) PrintfOut a
@@ -25 +26 @@
 #define ddprintf(a) if(dbglevel >= 1) PrintfOut a
 #define dgprintf(a) if(dbglevel >= 1) PrintfOut a
+#else
+#define dprintf(a)  //if(dbglevel >= 1) PrintfOut a
+#define dprintf2(a) //if(dbglevel >= 2) PrintfOut a
+#define dprintf3(a) //if(dbglevel >= 3) PrintfOut a
+#define dprintf4(a) //if(dbglevel >= 4) PrintfOut a
+#define ddprintf(a) //if(dbglevel >= 1) PrintfOut a
+#define dgprintf(a) //if(dbglevel >= 1) PrintfOut a
+#endif
 
 #ifdef DEBUG
-#define DebugInt3() _asm int 3
+#define DebugInt3() //_asm int 3 DAZ temporarily taken out of debug build to prevent traps
 #else
 #define DebugInt3() //_asm int 3

OCO/trunk/install/control.scr

@@ -25 +25 @@
 ssgroup=0
 ssname="mmbase"
-ssversion="1.1.4-RC7"
+ssversion="1.9.1-SVNr483"
 sstermdll="ITERM.DLL"
 sstermdllentry="ITermEntry"
@@ -43 +43 @@
 ssgroup=17
 ssname="OS/2 Universal Audio: Wave"
-ssversion="1.1.4-RC7"
+ssversion="1.9.1-SVNr483"
 sssize=680
 ssdll="genin.dll"

OCO/trunk/listerr.cmd

@@ -2 +2 @@
 del all.txt
 
-'dir *.err /s /m /h /k /f >tmp.xxx'
+'dir *.err /f /s >tmp.xxx'
 
 LINEIN(tmp.xxx,1,0)

OCO/trunk/uniaud.inc

@@ -7 +7 @@
 # BUILDVERSION must be 3 parts, and only numbers like 5.44.108
 # It is best that 2'nd number is always 2 digits, eg at least 10
-BUILDVERSION = 1.9.0
+BUILDVERSION = 1.9.1
 
 # Fixpack version
@@ -13 +13 @@
 # ex RC3  GA  FIXPACK2 beta_47
 # Comment out to avoid a fixpack line in bldlevel
-FIXPACK = SVNr471
+FIXPACK = SVNr483
 
 # ALSA BUILD VERSION