Changeset 2637 for trunk/src

Timestamp:

Feb 4, 2000, 8:29:17 PM (26 years ago)

Author:

hugh

Message:

some minor dsound fixes

Location:

trunk/src/dsound

Files:

• OS2SNDBUFFER.CPP (modified) (9 diffs)
• asmutil.asm (added)
• asmutil.h (added)
• makefile (modified) (5 diffs)
• os2helper.cpp (modified) (2 diffs)

trunk/src/dsound/OS2SNDBUFFER.CPP

@@ -1 @@
-/* $Id: OS2SNDBUFFER.CPP,v 1.5 1999-11-14 22:12:15 hugh Exp $ */
+/* $Id: OS2SNDBUFFER.CPP,v 1.6 2000-02-04 19:29:16 hugh Exp $ */
 
 /*
@@ -100 +100 @@
           bufferdesc.lpwfxFormat->cbSize + sizeof(WAVEFORMATEX));
 
+  bufferdesc.lpwfxFormat = lpfxFormat;
+
   lpBuffer = (LPSTR)VirtualAlloc( 0, bufferdesc.dwBufferBytes, MEM_COMMIT, PAGE_READWRITE);
   if(lpBuffer == NULL)
@@ -108 +110 @@
       return;
   }
+
 }
 //******************************************************************************
@@ -210 +213 @@
     Ticks = CurrentTicks-me->LastTickCnt;
     dprintf(("  Is Playing, Ticks: Last %d Current %d Difference %d",me->LastTickCnt, CurrentTicks,Ticks));
-    me->LastTickCnt = CurrentTicks;
-
-    NewPos = ((me->frequency*Ticks)/1000)*(me->bufferdesc.lpwfxFormat->wBitsPerSample/8);
+    dprintf(("  Frequency: %d Bits per Sample %d",me->frequency,me->lpfxFormat->wBitsPerSample));
+
+    NewPos = ((me->frequency*Ticks)/1000)*(me->lpfxFormat->wBitsPerSample/8);
     dprintf(("  advance pos by %d bytes",NewPos));
+
+    if(NewPos)
+      me->LastTickCnt = CurrentTicks;
 
     if(me->playpos+NewPos >= me->bufferdesc.dwBufferBytes)
@@ -235 +241 @@
     if(me->writepos >= me->bufferdesc.dwBufferBytes)
       me->writepos = me->writepos % me->bufferdesc.dwBufferBytes;
-
+    dprintf(("  new Pos Write: %d   Play: %d",me->writepos,me->playpos));
   }
   else
@@ -361 +367 @@
     dwWriteCursor = me->writepos;
   }
+  dprintf(("  Buffer at 0x%08X Size %d",me->lpBuffer,me->bufferdesc.dwBufferBytes));
   if(dwWriteCursor + dwWriteBytes > me->bufferdesc.dwBufferBytes )
   {
     *(DWORD *)lplpvAudioPtr1  = (DWORD)(me->lpBuffer + dwWriteCursor);
     *lpdwAudioBytes1          = me->bufferdesc.dwBufferBytes - dwWriteCursor;
+    dprintf(("  Lock1 at 0x%08X Size %d",*(DWORD *)lplpvAudioPtr1,*lpdwAudioBytes1));
     if(lplpvAudioPtr2 && lpdwAudioBytes2)
     {
-        *(DWORD *)lplpvAudioPtr2   = (DWORD)me->lpBuffer;
-        *lpdwAudioBytes2           = dwWriteBytes - *lpdwAudioBytes1;
+      *(DWORD *)lplpvAudioPtr2   = (DWORD)me->lpBuffer;
+      *lpdwAudioBytes2           = dwWriteBytes - *lpdwAudioBytes1;
+      dprintf(("  Lock2 at 0x%08X Size %d",*(DWORD *)lplpvAudioPtr2,*lpdwAudioBytes2));
     }
   }
@@ -375 +384 @@
     *(DWORD *)lplpvAudioPtr1  = (DWORD)(me->lpBuffer + dwWriteCursor);
     *lpdwAudioBytes1          = dwWriteBytes;
+    dprintf(("  Lock1 at 0x%08X Size %d",*(DWORD *)lplpvAudioPtr1,*lpdwAudioBytes1));
     if(lplpvAudioPtr2 && lpdwAudioBytes2)
     {
-        *(DWORD *)lplpvAudioPtr2   = 0;
-        *lpdwAudioBytes2           = 0;
+      *(DWORD *)lplpvAudioPtr2   = 0;
+      *lpdwAudioBytes2           = 0;
+      dprintf(("  Lock2 at 0x%08X Size %d",*(DWORD *)lplpvAudioPtr2,*lpdwAudioBytes2));
     }
   }
@@ -493 +504 @@
     me->LastTickCnt = CurrentTicks;
 
-    NewPos = ((me->frequency*Ticks)/1000)*(me->bufferdesc.lpwfxFormat->wBitsPerSample>>8);
+    NewPos = ((me->frequency*Ticks)/1000)*(me->lpfxFormat->wBitsPerSample>>8);
     if(me->playpos+NewPos >= me->bufferdesc.dwBufferBytes)
     {
@@ -531 +542 @@
     return DSERR_INVALIDPARAM;
   }
+
   return DS_OK;
 }

trunk/src/dsound/makefile

@@ -1 @@
-# $Id: makefile,v 1.12 2000-01-26 23:19:55 sandervl Exp $
+# $Id: makefile,v 1.13 2000-02-04 19:29:17 hugh Exp $
 
 #
@@ -14 +14 @@
 
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
-
+ASFLAGS = -Sc -Sv:ALP
 
 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
@@ -22 +22 @@
 TARGET = dsound
 
-OBJS =  dsound.obj os2dsound.obj initterm.obj os2sndbuffer.obj os2helper.obj
+OBJS =  dsound.obj os2dsound.obj initterm.obj os2sndbuffer.obj os2helper.obj asmutil.obj
 #OBJS =  dsound.obj initterm.obj
 
@@ -43 +43 @@
 
 
-
 dsound.obj: dsound.cpp \
     $(PDWIN32_INCLUDE)/misc.h \
@@ -61 +60 @@
     $(PDWIN32_INCLUDE)/os2wrap.h
 
+asmutil.obj: asmutil.asm
 
 initterm.obj: initterm.cpp initterm.h

trunk/src/dsound/os2helper.cpp

@@ -3 +3 @@
 #include <os2wrap.h>
 #include <misc.h>
+#include "asmutil.h"
 
 typedef ULONG DWORD ;
 
-#if 0
+#if 1
 DWORD GetTickCountOS2()
 {
@@ -22 +23 @@
   QWORD qwTickCount;
   ULONG ulFreq;
-  DWORD dwTick;
+  ULONG ulTicks;
   APIRET rc;
 
   rc = DosTmrQueryFreq( &ulFreq);
+  dprintf(("DSOUND: GetTickCountOS2 Freq: %d(%08X)\n",
+           ulFreq, ulFreq));
+
   if(0==rc)
   {
     rc = DosTmrQueryTime(&qwTickCount);
-    if(0==rc)
-    {
-      ulFreq /=1000;
-      dwTick = qwTickCount.ulLo / ulFreq;
-      //dwTick = ( (qwTickCount.ulHi <<24)+ (qwTickCount.ulLo>>8)) / (ulFreq>>8);
-    }
+    dprintf(("DSOUND: GetTickCountOS2 Time %d(%08X) : %d(%08X)\n",
+             qwTickCount.ulHi, qwTickCount.ulHi,
+             qwTickCount.ulLo,qwTickCount.ulLo, ulTicks));
+    ulTicks = GetMsCount(&qwTickCount,ulFreq);
+    dprintf(("DSOUND: GetTickCountOS2 ms Ticks %d\n"));
   }
-  //dprintf(("DSOUND: GetTickCountOS2 Freq: %d(%08X) Time %d(%08X) : %d(%08X)\n",
-  //         ulFreq, ulFreq,
-  //         qwTickCount.ulHi, qwTickCount.ulHi,
-  //         qwTickCount.ulLo,qwTickCount.ulLo));
-  return 0==rc?dwTick:0x00FFDEAD;
+  return 0==rc?ulTicks:0x00FFDEAD;
 }
 #endif