WebSVN – Games.Rick Dangerous – Diff – //src/syssnd.c

 #define ADJVOL(S) (((S) *sndVol) / SDL_MIX_MAXVOLUME)
 static U8 isAudioActive = FALSE;
-static channel_t channel[SYSSND_MIXCHANNELS];
+static channel_t channels[SYSSND_MIXCHANNELS];
 static U8 sndVol = SDL_MIX_MAXVOLUME;   /* internal volume */
 static U8 sndUVol = SYSSND_MAXVOL;   /* user-selected volume */
 static U8 sndMute = FALSE;   /* mute flag */
-static SDL_mutex *sndlock;
 /*
  * prototypes
  */
-static int sdlRWops_open (SDL_RWops *context, char *name);
-static int sdlRWops_seek (SDL_RWops *context, int offset, int whence);
-static int sdlRWops_read (SDL_RWops *context, void *ptr, int size, int maxnum);
-static int sdlRWops_write (SDL_RWops *context, const void *ptr, int size, int num);
-static int sdlRWops_close (SDL_RWops *context);
-static void end_channel (U8);
+static void end_channel (channel_t *);
 /*
  * Callback -- this is also where all sound mixing is done
+ *
  * may be more efficient to mix samples every frame, or maybe everytime a
  * new sound is sent to be played. I don't know.
  */
 void syssnd_callback (void *userdata, U8 *stream, int len)
+{
+   channel_t *channel;
-   U8 c;
+   U8 channel_index;
-   S16 s;
+   S16 final_sample;
    U32 i;
-   SDL_mutexP(sndlock);
+   //
-   for (i = 0; i < (U32)len; i++)
+   for (i = 0; i < (U32)len; i += 2)
+   {
-      s = 0;
+      final_sample = 0;
-      for (c = 0; c < SYSSND_MIXCHANNELS; c++)
+      for (channel_index = 0; channel_index < SYSSND_MIXCHANNELS; channel_index++)
+      {
+         channel = &channels[channel_index]; // quick access to channel
-         if (channel[c].loop != 0)
+         if (channel->loop == 0)
+            continue;
+         // channel is active
+         if (channel->len > 0)
+         {
+            // not ending
+            final_sample += ADJVOL (*((U16 *) channel->buf));
+            channel->buf += 2;
-            /* channel is active */
+            channel->len -= 2;
+         }
+         else
+         {
+            // ending
-            if (channel[c].len > 0)
+            if (channel->loop > 0)
+               channel->loop--;
+            if (channel->loop)
+            {
-               /* not ending */
+               // just loop
+               channel->buf = channel->snd->buf;
+               channel->len = channel->snd->len;
-               s += ADJVOL (*channel[c].buf - 0x80);
+               final_sample += ADJVOL (*((U16 *) channel->buf));
-               channel[c].buf++;
+               channel->buf += 2;
-               channel[c].len--;
+               channel->len -= 2;
+            }
             else
-            {
-               /* ending */
-               if (channel[c].loop > 0)
-                  channel[c].loop--;
-               if (channel[c].loop)
-               {
-                  /* just loop */
-                  channel[c].buf = channel[c].snd->buf;
-                  channel[c].len = channel[c].snd->len;
-                  s += ADJVOL (*channel[c].buf - 0x80);
-                  channel[c].buf++;
-                  channel[c].len--;
-               }
-               else
-                  end_channel(c); /* end for real */
+               end_channel (channel); // end for real
-            }
+         }
+      }
-      if (sndMute)
-         stream[i] = 0x80;
-      else
-      {
-         s += 0x80;
-         if (s > 0xff) s = 0xff;
-         if (s < 0x00) s = 0x00;
-         stream[i] = (U8) s;
+      *((S16 *) &stream[i]) = (sndMute ? 0 : final_sample);
-      }
+   }
-   memcpy (stream, stream, len);
-   SDL_mutexV (sndlock);
+}
-static void end_channel (U8 c)
+static void end_channel (channel_t *channel)
+{
-   channel[c].loop = 0;
+   channel->loop = 0;
-   if (channel[c].snd->dispose)
+   if (channel->snd->dispose)
-      syssnd_free (channel[c].snd);
+      syssnd_free (channel->snd);
-   channel[c].snd = NULL;
+   channel->snd = NULL;
+}
 void syssnd_init (void)
+{
-   SDL_AudioSpec desired, obtained;
+   SDL_AudioSpec desired;
    U16 c;
    if (SDL_InitSubSystem (SDL_INIT_AUDIO) < 0)
       return;
    desired.freq = SYSSND_FREQ;
-   desired.format = AUDIO_U8;
+   desired.format = AUDIO_S16;
    desired.channels = SYSSND_CHANNELS;
    desired.samples = SYSSND_MIXSAMPLES;
    desired.callback = syssnd_callback;
    desired.userdata = NULL;
-   if (SDL_OpenAudio (&desired, &obtained) < 0)
+   if (SDL_OpenAudio (&desired, NULL) < 0)
       return;
-   sndlock = SDL_CreateMutex ();
-   if (sndlock == NULL)
-   {
-      SDL_CloseAudio ();
-      return;
-   }
    if (sysarg_args_vol != 0)
+   {
       sndUVol = sysarg_args_vol;
       sndVol = SDL_MIX_MAXVOLUME * sndUVol / SYSSND_MAXVOL;
+   }
    for (c = 0; c < SYSSND_MIXCHANNELS; c++)
-      channel[c].loop = 0;   /* deactivate */
+      channels[c].loop = 0;   /* deactivate */
    isAudioActive = TRUE;
    SDL_PauseAudio (0);
+}
+{
    if (!isAudioActive)
       return;
    SDL_CloseAudio ();
-   SDL_DestroyMutex (sndlock);
    isAudioActive = FALSE;
+}
 /*
  * When muted, sounds are still managed but not sent to the dsp, hence
  * it is possible to un-mute at any time.
  */
 void syssnd_toggleMute (void)
+{
-   SDL_mutexP (sndlock);
    sndMute = !sndMute;
-   SDL_mutexV (sndlock);
+}
 void syssnd_vol (S8 d)
+{
    if ((d < 0 && sndUVol > 0) || (d > 0 && sndUVol < SYSSND_MAXVOL))
+   {
       sndUVol += d;
-      SDL_mutexP (sndlock);
       sndVol = SDL_MIX_MAXVOLUME * sndUVol / SYSSND_MAXVOL;
-      SDL_mutexV (sndlock);
+   }
+}
 /*
  * twice the same sound playing -- tends to become noisy when too many
  * bad guys die at the same time).
  */
 S8 syssnd_play (sound_t *sound, S8 loop)
+{
-   S8 c;
+   S8 channel_index;
-   if (!isAudioActive)
+   if ((sound == NULL) || !isAudioActive)
-      return -1;
+      return (-1);
-   if (sound == NULL)
-      return -1;
-   c = 0;
-   SDL_mutexP (sndlock);
+   for (channel_index = 0; channel_index < SYSSND_MIXCHANNELS; channel_index++)
-   while ((channel[c].snd != sound || channel[c].loop == 0) && channel[c].loop != 0 && c < SYSSND_MIXCHANNELS)
+      if ((channels[channel_index].snd == sound) || (channels[channel_index].loop == 0))
-      c++;
+         break; // look for a free channel slot
-   if (c == SYSSND_MIXCHANNELS)
+   if (channel_index == SYSSND_MIXCHANNELS)
-      c = -1;
+      return (-1);
-   if (c >= 0)
-   {
-      channel[c].loop = loop;
+   channels[channel_index].loop = loop;
-      channel[c].snd = sound;
+   channels[channel_index].snd = sound;
-      channel[c].buf = sound->buf;
+   channels[channel_index].buf = sound->buf;
-      channel[c].len = sound->len;
+   channels[channel_index].len = sound->len;
-   }
-   SDL_mutexV (sndlock);
-   return c;
+   return (channel_index);
+}
 /*
  * Pause
+ *
  * pause: TRUE or FALSE
  * clear: TRUE to cleanup all sounds and make sure we start from scratch
  */
-void syssnd_pause (U8 pause, U8 clear)
+void syssnd_pause (U8 want_pause, U8 want_clear)
+{
-   U8 c;
+   U8 channel_index;
    if (!isAudioActive)
       return;
-   if (clear == TRUE)
+   if (want_clear)
-   {
-      SDL_mutexP (sndlock);
-      for (c = 0; c < SYSSND_MIXCHANNELS; c++)
+      for (channel_index = 0; channel_index < SYSSND_MIXCHANNELS; channel_index++)
-         channel[c].loop = 0;
+         channels[channel_index].loop = 0;
-      SDL_mutexV (sndlock);
-   }
-   if (pause == TRUE)
-      SDL_PauseAudio (1);
-   else
-      SDL_PauseAudio (0);
+   SDL_PauseAudio (want_pause ? 1 : 0);
+}
 /*
  * Stop a channel
 void syssnd_stopchan (S8 chan)
+{
    if (chan < 0 || chan > SYSSND_MIXCHANNELS)
       return;
-   SDL_mutexP (sndlock);
-   if (channel[chan].snd)
+   if (channels[chan].snd)
-      end_channel (chan);
+      end_channel (&channels[chan]);
-   SDL_mutexV (sndlock);
+}
 /*
  * Stop a sound
+{
    U8 i;
    if (!sound)
       return;
-   SDL_mutexP (sndlock);
    for (i = 0; i < SYSSND_MIXCHANNELS; i++)
-      if (channel[i].snd == sound)
+      if (channels[i].snd == sound)
-         end_channel (i);
+         end_channel (&channels[i]);
-   SDL_mutexV (sndlock);
+}
 /*
  * See if a sound is playing
  */
 int syssnd_isplaying (sound_t *sound)
+{
-   U8 i, playing;
+   U8 i;
-   playing = 0;
-   SDL_mutexP (sndlock);
    for (i = 0; i < SYSSND_MIXCHANNELS; i++)
-      if (channel[i].snd == sound)
+      if (channels[i].snd == sound)
-         playing = 1;
+         return (1);
-   SDL_mutexV (sndlock);
-   return playing;
+   return (0);
+}
 /*
  * Stops all channels.
  */
 void syssnd_stopall (void)
+{
    U8 i;
-   SDL_mutexP (sndlock);
    for (i = 0; i < SYSSND_MIXCHANNELS; i++)
-      if (channel[i].snd)
+      if (channels[i].snd)
-         end_channel (i);
+         end_channel (&channels[i]);
-   SDL_mutexV (sndlock);
+}
 /*
  * Load a sound.
  */
 sound_t *syssnd_load (char *name)
+{
    char *soundfile_fullpathname;
    sound_t *s;
-   SDL_RWops *context;
    SDL_AudioSpec audiospec;
    /* alloc space for sound file's full pathname and build it */
    soundfile_fullpathname = (char *) malloc (1024);
    sprintf_s (soundfile_fullpathname, 1024, "%s/%s", sys_getbasepath (), name);
-   /* alloc context */
-   context = malloc (sizeof (SDL_RWops));
-   context->seek = sdlRWops_seek;
-   context->read = sdlRWops_read;
-   context->write = sdlRWops_write;
-   context->close = sdlRWops_close;
-   /* open */
-   if (sdlRWops_open (context, soundfile_fullpathname) == -1)
-   {
-      free (soundfile_fullpathname);
-      return NULL;
-   }
-   free (soundfile_fullpathname);
    /* alloc sound */
    s = malloc (sizeof (sound_t));
    /* read */
    /* second param == 1 -> close source once read */
-   if (!SDL_LoadWAV_RW (context, 1, &audiospec, &(s->buf), &(s->len)))
+   if (!SDL_LoadWAV_RW (SDL_RWFromFile (soundfile_fullpathname, "rb"), 1, &audiospec, &(s->buf), &(s->len)))
+   {
       free (s);
       return NULL;
+   }
+   free (soundfile_fullpathname);
    s->dispose = FALSE;
    return s;
+}
    if (s->buf)
       SDL_FreeWAV (s->buf);
    s->buf = NULL;
    s->len = 0;
-}
-/*
- *
- */
-static int sdlRWops_open (SDL_RWops *context, char *name)
-{
-   FILE *fp;
-   fopen_s (&fp, name, "rb");
-   if (!fp)
-      return -1;
-   context->hidden.unknown.data1 = (void *) fp;
-   return 0;
-}
-static int sdlRWops_seek (SDL_RWops *context, int offset, int whence)
-{
-   return (fseek ((FILE *) context->hidden.unknown.data1, offset, whence));
-}
-static int sdlRWops_read (SDL_RWops *context, void *ptr, int size, int maxnum)
-{
-   return (fread (ptr, size, maxnum, (FILE *) context->hidden.unknown.data1));
-}
-static int sdlRWops_write (SDL_RWops *context, const void *ptr, int size, int num)
-{
-   return -1; /* not implemented */
-}
-static int sdlRWops_close (SDL_RWops *context)
-{
-   if (context)
-   {
-      fclose ((FILE *) context->hidden.unknown.data1);
-      free (context);
-   }
-   return 0;
+}

Subversion Repositories Games.Rick Dangerous

Games.Rick Dangerous//src/syssnd.c – Rev 2 → 5