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

Timestamp:

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

Author:

David Azarewicz

Message:

Rework buffer management

File:

• OCO/trunk/drv16/stream.cpp (modified) (8 diffs)

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};