Changeset 483 for OCO/trunk/drv16/dwavestrm.cpp

Timestamp:

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

Author:

David Azarewicz

Message:

Rework buffer management

File:

• OCO/trunk/drv16/dwavestrm.cpp (modified) (10 diffs)

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"));