Changeset 3555 for trunk/src/dsound/dart.cpp

Timestamp:

May 18, 2000, 10:37:10 PM (25 years ago)

Author:

mike

Message:

Updated and slightly fixed DSOUND

File:

• trunk/src/dsound/dart.cpp (modified) (9 diffs)

trunk/src/dsound/dart.cpp

@@ -1 +1 @@
 /*
+ *  Dart Interface..
+ *
  *  Kevin Langman
  *
- *  The Dart functions are here to avoid the conficts with the
- *  the OS/2 mcios2.h, meerror.h, os2medef.h and mmsystem.h
+ *  Project Odin Software License can be found in LICENSE.TXT
  *
  */
@@ -12 +13 @@
 #include <os2mewrap.h>
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -43 +45 @@
    ULONG           rc;
 
-   if ((ulFlags == MIX_WRITE_COMPLETE) ||
-       ((ulFlags == (MIX_WRITE_COMPLETE | MIX_STREAM_ERROR))&&
-       (ulStatus == ERROR_DEVICE_UNDERRUN)))
+   if( ( (ulFlags == MIX_WRITE_COMPLETE) ||
+         ((ulFlags == (MIX_WRITE_COMPLETE | MIX_STREAM_ERROR))&&
+         (ulStatus == ERROR_DEVICE_UNDERRUN)) )
+     )
    {
       lLastBuff++;
-      if (lLastBuff == ulNumDartBuffs)
+      if (lLastBuff == ulNumDartBuffs){
          lLastBuff = 0;
+      }
+
+      if( fIsPlaying == FALSE /*&& lLastBuff == 0*/ ){
+         mciSendCommand(usDeviceID, MCI_STOP, MCI_WAIT, NULL, 0);
+         return TRUE;
+      }
 
       /* Now mix sound from all playing secondary SoundBuffers into the primary buffer */
@@ -59 +68 @@
       /* Send the NEXT Buffer to Dart for playing! */
       rc = MixSetup_Global->pmixWrite(MixSetup_Global->ulMixHandle, &pMixBuffers[lLastBuff], 1 );
-      //dprintf(("DSOUND-DART: Playing Next Buffer %d", rc));
    }
 
@@ -104 +112 @@
    memset(&AmpOpenParms, 0, sizeof(MCI_AMP_OPEN_PARMS));
    AmpOpenParms.usDeviceID    = 0;
-   AmpOpenParms.pszDeviceType = (PSZ)MCI_DEVTYPE_AUDIO_AMPMIX;
+   //AmpOpenParms.pszDeviceType = (PSZ)MCI_DEVTYPE_AUDIO_AMPMIX;
+   AmpOpenParms.pszDeviceType = (PSZ)MAKEULONG(MCI_DEVTYPE_AUDIO_AMPMIX, (USHORT)device);
 
    rc = mciSendCommand(0, MCI_OPEN, MCI_WAIT | MCI_OPEN_TYPE_ID, (PVOID)&AmpOpenParms, 0);
@@ -133 +142 @@
    /* Create the Audio Buffer */
    // OK... Since DSound only uses 1 buffer and uses the GetPosition API to
-   // figure out where it can and can't write, I have emulating this by
-   // using 16 1kb buffers and do locking by tracking what buffer is currently
-   // playing. This maybe less CPU friendly then other methods but it's the best
-   // my little brain could come up with!!
+   // figure out where it can and can't write. I have emulating this by
+   // using many smaller buffers and do locking by tracking what buffer that is
+   // currently playing. This maybe less CPU friendly then other methods but
+   // it's the best my little brain could come up with!!
 
    MixSetupParms.ulBufferSize = BUFFER_SIZE / ulNumDartBuffs;
@@ -153 +162 @@
 
    /* Clear the Buffer */
-   // Todo:  I don't know if Dart expects Signed or Unsigned data... This will
-   // ok until I look in to this... Also it may be that Dart uses signed for
-   // 8bit data and unsigned for 16it.. Anyhow the worst that can happen by setting
-   // the buffer to 0 is a click on Dart_Play and a Clink when real sound is written
-   // to the buffer!
+   // Set initial values to 32767 to avoid clicks on start of playback.
    for (device = 0; device < ulNumDartBuffs; device++) {
-      memset(pMixBuffers[device].pBuffer, 0, BUFFER_SIZE/ulNumDartBuffs);
+      memset(pMixBuffers[device].pBuffer, 32767, BUFFER_SIZE/ulNumDartBuffs);
    }
 
@@ -308 +313 @@
 
    /* Clear the Buffer */
-   // Todo:  I don't know if Dart expects Signed or Unsigned data... This will
-   // ok until I look in to this... Also it may be that Dart uses signed for
-   // 8bit data and unsigned for 16it.. Anyhow the worst that can happen by setting
-   // the buffer to 0 is a click on Dart_Play and a Clink when real sound is written
-   // to the buffer!
+   // If the data is 8bit  then set values to 127
+   // If the data is 16bit then set values to 32767
+   // Doing this will avoid the clicks at the beging of playback! :)
    for (int i=0; i<ulNumDartBuffs; i++) {
-      memset(pMixBuffers[i].pBuffer, 0, BUFFER_SIZE/ulNumDartBuffs);
-   }
+      memset(pMixBuffers[i].pBuffer, lBPS == 8 ? 127 : 32767, BUFFER_SIZE / ulNumDartBuffs);
+   }
+
+   lLastBuff = 0; /* we have to reset this, the number of buffers probably changed! */
 
    /* If the primary buffer was playing, we have to restart it!! */
@@ -347 +352 @@
 
    fIsPlaying = FALSE;
-//   rc = mciSendCommand(usDeviceID, MCI_PAUSE, MCI_WAIT, NULL, 0);
-   rc = mciSendCommand(usDeviceID, MCI_STOP, MCI_WAIT, NULL, 0);
-   if (rc != MCIERR_SUCCESS) {
-      dprintf(("DSOUND-DART: MCI_PAUSE %d", rc));
-      return DSERR_GENERIC;
-   }
+
+   // The OS2_Dart_Update function is now used to send the MCI_STOP!!
+   // Doing this fixes a bug where after a Dart_Stop call the sound would
+   // continue to loop because the OS2_Dart_Update would send the next
+   // buffer causing Dart to start again..
+
+   //rc = mciSendCommand(usDeviceID, MCI_STOP, MCI_WAIT, NULL, 0);
+   //if (rc != MCIERR_SUCCESS) {
+   //   { FILE *dbf; dbf=fopen("log.log", "a"); fprintf( dbf, "Error in MCI_STOP...\n"); fclose(dbf); }
+   //   dprintf(("DSOUND-DART: MCI_PAUSE %d", rc));
+   //   return DSERR_GENERIC;
+   //}
+
+
    return DS_OK;
 }