WebSVN – Games.Chess Giants – Diff – //audio.cpp

 // global variables used in this module only
 static ALCdevice *openal_device;
 static ALCcontext *openal_context;
 static openal_buffer_t *soundbuffers; // mallocated linked list
 static openal_source_t *sources; // mallocated
-static enqueued_sound_t enqueued_sound;
+static enqueued_sound_t enqueued_sounds[8];
+static int enqueued_sound_count = 0;
 static int source_count;
 bool Audio_Init (void)
+{
    soundbuffers = NULL; // we know no soundbuffer yet
    sources = NULL; // we have no playing source yet
    source_count = 0;
+   memset (enqueued_sounds, 0, sizeof (enqueued_sounds));
-   enqueued_sound.type = 0; // no sound is enqueued yet
+   enqueued_sound_count = 0; // no sound is enqueued yet
    return (true); // audio subsystem successfully initialized
+}
+{
    // this function enqueues sounds, plays them and disposes of sound buffers and sources that have finished playing
    static wchar_t soundfile_path[MAX_PATH];
-   enqueued_sound_t processed_sound;
+   enqueued_sound_t *processed_sound;
    openal_buffer_t *soundbuffer;
    ALfloat camera_position[3];
    ALfloat forward_and_up[6];
    unsigned long current_pos;
    buffer_t soundfile;
    int sample_rate;
    int channel_count;
    int channel_index;
    int channel_size;
    int source_index;
+   int sound_index;
    uint32_t chunk_id;
    uint32_t blksiz;
    uint32_t temp32;
    uint16_t temp16;
    ALint status;
    // update the listener's position and orientation
    alListener3f (AL_POSITION, camera_position[0], camera_position[1], camera_position[2]);
    alListener3f (AL_VELOCITY, 0, 0, 0); // TODO: compute velocity dynamically with previous position
    alListenerfv (AL_ORIENTATION, forward_and_up);
-   // is one sound enqueued for playing ?
+   // are there sounds enqueued for playing ? if so, process them one after the other
-   if (enqueued_sound.type != 0)
+   for (sound_index = 0; sound_index < enqueued_sound_count; sound_index++)
+   {
-      memcpy (&processed_sound, &enqueued_sound, sizeof (enqueued_sound_t));
+      processed_sound = &enqueued_sounds[sound_index]; // quick access to enqueued sound
-      enqueued_sound.type = 0; // have a copy of it quickly and reset it (helps preserve thread safety)
       // given the type of sound we want, enqueue the right one
       pitch = 1.0f; // assume fixed pitch until told otherwise
-      if      (processed_sound.type == SOUNDTYPE_CLICK)       swprintf_s (soundfile_path, WCHAR_SIZEOF (soundfile_path), L"%s/themes/%s/sounds/click.wav", app_path, theme->name);
+      if      (processed_sound->type == SOUNDTYPE_CLICK)       swprintf_s (soundfile_path, WCHAR_SIZEOF (soundfile_path), L"%s/themes/%s/sounds/click.wav", app_path, theme->name);
-      else if (processed_sound.type == SOUNDTYPE_ILLEGALMOVE) swprintf_s (soundfile_path, WCHAR_SIZEOF (soundfile_path), L"%s/themes/%s/sounds/illegal.wav", app_path, theme->name);
+      else if (processed_sound->type == SOUNDTYPE_ILLEGALMOVE) swprintf_s (soundfile_path, WCHAR_SIZEOF (soundfile_path), L"%s/themes/%s/sounds/illegal.wav", app_path, theme->name);
-      else if (processed_sound.type == SOUNDTYPE_VICTORY)     swprintf_s (soundfile_path, WCHAR_SIZEOF (soundfile_path), L"%s/themes/%s/sounds/win.wav", app_path, theme->name);
+      else if (processed_sound->type == SOUNDTYPE_VICTORY)     swprintf_s (soundfile_path, WCHAR_SIZEOF (soundfile_path), L"%s/themes/%s/sounds/win.wav", app_path, theme->name);
-      else if (processed_sound.type == SOUNDTYPE_DEFEAT)      swprintf_s (soundfile_path, WCHAR_SIZEOF (soundfile_path), L"%s/themes/%s/sounds/lose.wav", app_path, theme->name);
+      else if (processed_sound->type == SOUNDTYPE_DEFEAT)      swprintf_s (soundfile_path, WCHAR_SIZEOF (soundfile_path), L"%s/themes/%s/sounds/lose.wav", app_path, theme->name);
-      else if (processed_sound.type == SOUNDTYPE_CHECK)       swprintf_s (soundfile_path, WCHAR_SIZEOF (soundfile_path), L"%s/themes/%s/sounds/check.wav", app_path, theme->name);
+      else if (processed_sound->type == SOUNDTYPE_CHECK)       swprintf_s (soundfile_path, WCHAR_SIZEOF (soundfile_path), L"%s/themes/%s/sounds/check.wav", app_path, theme->name);
-      else if (processed_sound.type == SOUNDTYPE_PIECETAKEN)  swprintf_s (soundfile_path, WCHAR_SIZEOF (soundfile_path), L"%s/themes/%s/sounds/take.wav", app_path, theme->name);
+      else if (processed_sound->type == SOUNDTYPE_PIECETAKEN)  swprintf_s (soundfile_path, WCHAR_SIZEOF (soundfile_path), L"%s/themes/%s/sounds/take.wav", app_path, theme->name);
-      else if (processed_sound.type == SOUNDTYPE_HINTWINDOW)  swprintf_s (soundfile_path, WCHAR_SIZEOF (soundfile_path), L"%s/themes/%s/sounds/hintwindow.wav", app_path, theme->name);
+      else if (processed_sound->type == SOUNDTYPE_HINTWINDOW)  swprintf_s (soundfile_path, WCHAR_SIZEOF (soundfile_path), L"%s/themes/%s/sounds/hintwindow.wav", app_path, theme->name);
-      else if (processed_sound.type == SOUNDTYPE_IMPORTANT)   swprintf_s (soundfile_path, WCHAR_SIZEOF (soundfile_path), L"%s/themes/%s/sounds/important.wav", app_path, theme->name);
+      else if (processed_sound->type == SOUNDTYPE_IMPORTANT)   swprintf_s (soundfile_path, WCHAR_SIZEOF (soundfile_path), L"%s/themes/%s/sounds/important.wav", app_path, theme->name);
-      else if (processed_sound.type == SOUNDTYPE_MOVE)
+      else if (processed_sound->type == SOUNDTYPE_MOVE)
+      {
          temp32 = rand () % 6; // there are several movement sounds, pick one at random
          if      (temp32 == 0) swprintf_s (soundfile_path, WCHAR_SIZEOF (soundfile_path), L"%s/themes/%s/sounds/move1.wav", app_path, theme->name);
          else if (temp32 == 1) swprintf_s (soundfile_path, WCHAR_SIZEOF (soundfile_path), L"%s/themes/%s/sounds/move2.wav", app_path, theme->name);
          else if (temp32 == 2) swprintf_s (soundfile_path, WCHAR_SIZEOF (soundfile_path), L"%s/themes/%s/sounds/move3.wav", app_path, theme->name);
          else if (temp32 == 3) swprintf_s (soundfile_path, WCHAR_SIZEOF (soundfile_path), L"%s/themes/%s/sounds/move4.wav", app_path, theme->name);
          else if (temp32 == 4) swprintf_s (soundfile_path, WCHAR_SIZEOF (soundfile_path), L"%s/themes/%s/sounds/move5.wav", app_path, theme->name);
          else                  swprintf_s (soundfile_path, WCHAR_SIZEOF (soundfile_path), L"%s/themes/%s/sounds/move6.wav", app_path, theme->name);
          pitch = 1.0f + ((((float) rand ()) / RAND_MAX) - 0.5f) / 2.0f; // set a random pitch for these sounds between 0.75 and 1.25
+      }
-      else if (processed_sound.type == SOUNDTYPE_SLIDE)
+      else if (processed_sound->type == SOUNDTYPE_SLIDE)
+      {
          swprintf_s (soundfile_path, WCHAR_SIZEOF (soundfile_path), L"%s/themes/%s/sounds/slide.wav", app_path, theme->name);
          pitch = 1.0f + ((((float) rand ()) / RAND_MAX) - 0.5f) / 2.0f; // set a random pitch for these sounds between 0.75 and 1.25
+      }
       sources[source_index].is_used = true; // immediately mark it as used
       alGenSources (1, &sources[source_index].openal_source); // (re)create an OpenAL source
       alSourcef (sources[source_index].openal_source, AL_PITCH, (ALfloat) pitch); // set the source's pitch
       alSourcef (sources[source_index].openal_source, AL_GAIN, 1.0f); // set the source's volume (full)
-      alSource3f (sources[source_index].openal_source, AL_POSITION, (ALfloat) processed_sound.emitterlocation_x * ATTENUATION_FACTOR, (ALfloat) processed_sound.emitterlocation_y * ATTENUATION_FACTOR, (ALfloat) processed_sound.emitterlocation_z * ATTENUATION_FACTOR);
+      alSource3f (sources[source_index].openal_source, AL_POSITION, (ALfloat) processed_sound->emitterlocation_x * ATTENUATION_FACTOR, (ALfloat) processed_sound->emitterlocation_y * ATTENUATION_FACTOR, (ALfloat) processed_sound->emitterlocation_z * ATTENUATION_FACTOR);
       alSource3f (sources[source_index].openal_source, AL_VELOCITY, 0, 0, 0); // set the source's velocity (static)
       alSourcei (sources[source_index].openal_source, AL_LOOPING, AL_FALSE); // set it as non-looping
       alSourcei (sources[source_index].openal_source, AL_BUFFER, soundbuffer->openal_buffer); // attach our bufferized data to it
       // play the source! Audio_Think() will dispose of it when it's finished
       alSourcePlay (sources[source_index].openal_source);
+   }
+   enqueued_sound_count = 0; // after that, remember that all enqueued sounds have been sent to OpenAL
    // cycle through all used sources and see if one is no longer playing
    for (source_index = 0; source_index < source_count; source_index++)
+   {
       if (!sources[source_index].is_used)
 void Audio_PlaySound (int sound_type, float pos_x, float pos_y, float pos_z)
+{
    // helper function to play a sound (WARNING: it is NOT thread-safe!)
-   if (!options.want_sounds)
+   if (!options.want_sounds || (enqueued_sound_count == sizeof (enqueued_sounds) / sizeof (enqueued_sounds[0])))
-      return; // if we want no sound, don't play anything
+      return; // if we want no sound OR if there's no space to add one, don't play anything
-   enqueued_sound.type = sound_type; // enqueue this sound for playing. Audio_Think() will take care of it.
+   enqueued_sounds[enqueued_sound_count].type = sound_type; // enqueue this sound for playing. Audio_Think() will take care of it.
-   enqueued_sound.emitterlocation_x = pos_x;
+   enqueued_sounds[enqueued_sound_count].emitterlocation_x = pos_x;
-   enqueued_sound.emitterlocation_y = pos_y;
+   enqueued_sounds[enqueued_sound_count].emitterlocation_y = pos_y;
-   enqueued_sound.emitterlocation_z = pos_z;
+   enqueued_sounds[enqueued_sound_count].emitterlocation_z = pos_z;
+   enqueued_sound_count++; // there's now one more sound to play
    return; // finished
+}

Subversion Repositories Games.Chess Giants

Games.Chess Giants//audio.cpp – Rev 171 → 181