Changeset 5285 for trunk/src

Timestamp:

Mar 6, 2001, 9:11:17 PM (24 years ago)

Author:

mike

Message:

Slightly modified for building with Watcom.

Location:

trunk/src/dsound

Files:

• DSOUND.CPP (modified) (3 diffs)
• OS2PrimBuff.cpp (modified) (4 diffs)
• OS2PrimBuff.h (modified) (1 diff)
• OS2SNDBUFFER.CPP (modified) (4 diffs)
• dart.cpp (modified) (2 diffs)
• dsmixer.cpp (modified) (4 diffs)
• initterm.cpp (modified) (4 diffs)

trunk/src/dsound/DSOUND.CPP

@@ -1 @@
-/* $Id: DSOUND.CPP,v 1.7 2000-03-13 12:47:44 sandervl Exp $ */
+/* $Id: DSOUND.CPP,v 1.8 2001-03-06 20:11:16 mike Exp $ */
 
 /*
@@ -29 +29 @@
 
 OS2IDirectSound *DS = NULL;
+
+extern "C" {
 
 //******************************************************************************
@@ -241 +243 @@
   return S_FALSE;
 }//******************************************************************************
-
+}

trunk/src/dsound/OS2PrimBuff.cpp

@@ -1 @@
-/* $Id: OS2PrimBuff.cpp,v 1.4 2000-08-02 15:48:26 bird Exp $ */
+/* $Id: OS2PrimBuff.cpp,v 1.5 2001-03-06 20:11:16 mike Exp $ */
 /*
  *  DirectSound Primary Buffer
@@ -54 +54 @@
 OS2PrimBuff::OS2PrimBuff(OS2IDirectSound *DSound, const DSBUFFERDESC *lpDSBufferDesc )
 {
-   LONG rc;
-
    lpVtbl = &Vtbl;
    Vtbl.AddRef               = PrimBufAddRef;
@@ -224 +222 @@
    OS2PrimBuff *me = (OS2PrimBuff *)This;
    LONG lDartPos;
-   LONG lBytesPerSec;
 
    dprintf(("DSOUND-PrimBuff: GetCurrentPosition"));
@@ -266 +263 @@
    }
 
-   copysize = min(dwSizeAllocated, (me->lpfxFormat->cbSize + sizeof(WAVEFORMATEX)));
+   copysize = MIN(dwSizeAllocated, (me->lpfxFormat->cbSize + sizeof(WAVEFORMATEX)));
    memcpy(lpfxFormat, me->lpfxFormat, copysize);
 

trunk/src/dsound/OS2PrimBuff.h

@@ -44 +44 @@
 
     long  rate;    // Samples per second
-    long  bps;     // Bits per sample 8 or 16 !!
-    long  channels;// Number of Channels 1 or 2 MONO/Stereo
+    WORD  bps;     // Bits per sample 8 or 16 !!
+    WORD  channels;// Number of Channels 1 or 2 MONO/Stereo
 
     OS2IDirectSound3DListener* listener;  // pointer to the associated 3DListener object

trunk/src/dsound/OS2SNDBUFFER.CPP

@@ -1 @@
-/* $Id: OS2SNDBUFFER.CPP,v 1.8 2000-05-18 20:37:09 mike Exp $ */
+/* $Id: OS2SNDBUFFER.CPP,v 1.9 2001-03-06 20:11:16 mike Exp $ */
 
 /*
@@ -77 +77 @@
    // get the primary buffer from the DSound instance.
    primary = DSound->primary;
- 
+
    // We can still to the below logic just in case!!  Should not be required thow!
    // If the primary SoundBuffer doesn't exist by now, we have to create it!
@@ -328 +328 @@
       return DSERR_INVALIDPARAM;
    }
-   copysize = min(ddwSizeAllocated, (me->lpfxFormat->cbSize + sizeof(WAVEFORMATEX)));
+   copysize = MIN(ddwSizeAllocated, (me->lpfxFormat->cbSize + sizeof(WAVEFORMATEX)));
    memcpy(lpwfxFormat, me->lpfxFormat, copysize);
 
@@ -457 +457 @@
 {
    OS2IDirectSoundBuffer *me = (OS2IDirectSoundBuffer *)This;
-
-   ULONG ulBytesToPlay;
 
    dprintf(("DSOUND-OS2IDirectSoundBuffer::SoundBufPlay (buf=%X)", me));

trunk/src/dsound/dart.cpp

@@ -1 @@
-/* $Id: dart.cpp,v 1.3 2000-08-02 15:48:26 bird Exp $ */
+/* $Id: dart.cpp,v 1.4 2001-03-06 20:11:16 mike Exp $ */
 /*
  *  Dart Interface..
@@ -345 +345 @@
 long Dart_Stop(USHORT usDeviceID)
 {
-   ULONG   rc;
-
    dprintf(("DSOUND-DART: Dart_Stop"));
 

trunk/src/dsound/dsmixer.cpp

@@ -1 @@
-/* $Id: dsmixer.cpp,v 1.3 2000-08-02 15:48:27 bird Exp $ */
+/* $Id: dsmixer.cpp,v 1.4 2001-03-06 20:11:17 mike Exp $ */
 /*
  * DirectSound Software Mixer
@@ -161 +161 @@
    tomix = cbMix * 8 / outbits / outnch;
 
-   memset(&mixbuf, 0, tomix * 2 * sizeof(mixbuf[0]));
+   memset(&mixbuf[0], 0, tomix * 2 * sizeof(mixbuf[0]));
 
    while (inBuf != NULL) {
@@ -177 +177 @@
          if (mixbuf[i] <= -32768) data16b[outpos] = -32768;
          else if (mixbuf[i] >= 32767) data16b[outpos] = 32767;
-         else data16b[outpos] = mixbuf[i];
+         else data16b[outpos] = (signed short)mixbuf[i];
          outpos++;
          if (outpos >= outlen) outpos = 0;
@@ -186 +186 @@
          if (mixbuf[i] <= -32768) data8b[outpos] = 0;
          else if (mixbuf[i] >= 32767) data8b[outpos] = 255;
-         else data8b[outpos] = mixbuf[i] / 256 + 128;
+         else data8b[outpos] = (signed short)mixbuf[i] / 256 + 128;
          outpos++;
          if (outpos >= outlen) outpos = 0;

trunk/src/dsound/initterm.cpp

@@ -46 +46 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WINAPI LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
+BOOL WINAPI OdinLibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
 {
    switch (fdwReason)
    {
    case DLL_PROCESS_ATTACH:
-        return TRUE;
+        return TRUE;
 
    case DLL_THREAD_ATTACH:
    case DLL_THREAD_DETACH:
-        return TRUE;
+        return TRUE;
 
    case DLL_PROCESS_DETACH:
-        ctordtorTerm();
-        return TRUE;
+#ifdef __IBMCPP__
+        ctordtorTerm();
+#endif
+        return TRUE;
    }
    return FALSE;
@@ -71 +73 @@
 /* calling this function.                                                   */
 /****************************************************************************/
-unsigned long SYSTEM _DLL_InitTerm(unsigned long hModule, unsigned long
-                                   ulFlag)
+#ifdef __IBMCPP__
+unsigned long SYSTEM _DLL_InitTerm(unsigned long hModule, unsigned long ulFlag)
+#else
+unsigned long APIENTRY LibMain(unsigned long hModule, unsigned long ulFlag)
+#endif
 {
-   size_t i;
-   APIRET rc;
 
    /*-------------------------------------------------------------------------*/
@@ -86 +89 @@
       case 0 :
       {
-         DosQueryModuleName(hModule, CCHMAXPATH, dsoundPath);
+         DosQueryModuleName(hModule, CCHMAXPATH, dsoundPath);
          char *endofpath = strrchr(dsoundPath, '\\');
          if(endofpath) *(endofpath+1) = 0;
+#ifdef __IBMCPP__
          ctordtorInit();
-
+#endif
          CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
 
-         dllHandle = RegisterLxDll(hModule, LibMain, (PVOID)&_Resource_PEResTab);
-         if(dllHandle == 0) 
-                return 0UL;
+         dllHandle = RegisterLxDll(hModule, OdinLibMain, (PVOID)&_Resource_PEResTab);
+         if(dllHandle == 0)
+                return 0UL;
 
          break;
@@ -102 +106 @@
       case 1 :
          if(dllHandle) {
-                UnregisterLxDll(dllHandle);
+                UnregisterLxDll(dllHandle);
          }
          break;