Add TODO(#1072)

[nothing.git] / src / game / sound_samples.c

diff --git a/src/game/sound_samples.c b/src/game/sound_samples.c
index 0e21484c5df4ae13f5d6aceb124e7c38053439c8..1db8f5ccc526ee6341338db1f527b01867d7eeb5 100644 (file)
--- a/src/game/sound_samples.c
+++ b/src/game/sound_samples.c
@@ -18,8 +18,10 @@ struct Sound_samples
     SDL_AudioDeviceID dev;
     uint8_t **audio_buf_array;
     uint32_t *audio_buf_size_array;
+    uint8_t **active_audio_buf_array;
     size_t samples_count;
     int paused;
+    float volume;
 };
 
 static 
@@ -84,6 +86,23 @@ int init_buffer_and_device(Sound_samples *sound_samples,
         }
     }
     
+    /* Allocating active audio buffer location*/
+    //TODO(#1072): Allocate one huge active audio buffer with length of the maximum of all audio buffer, instead of one active buffer for each audio
+    sound_samples->active_audio_buf_array = PUSH_LT(sound_samples->lt, nth_calloc(sound_samples->samples_count, sizeof(uint8_t*)), free);
+    if (sound_samples->active_audio_buf_array == NULL) {
+      log_fail("Failed to allocate memory for active audio buffer pointer array\n");
+      return -1;
+    }
+    for (size_t i = 0; i < sound_samples->samples_count; ++i) {
+      sound_samples->active_audio_buf_array[i] = PUSH_LT(sound_samples->lt, nth_calloc(sound_samples->audio_buf_size_array[i],
+                                                                                       sizeof(uint8_t)), free);
+      if (sound_samples->active_audio_buf_array == NULL) {
+        log_fail("Failed to allocate memory for active audio buffer array\n");
+        return -1;
+      }
+    }
+
+    /* Opening the device*/
     sound_samples->dev = SDL_OpenAudioDevice(NULL, 0, &destination_spec, NULL, 0);
     if (sound_samples->dev == 0) {
         log_fail("SDL_OpenAudioDevice failed: %s\n", SDL_GetError());
@@ -135,8 +154,19 @@ int sound_samples_play_sound(Sound_samples *sound_samples,
     trace_assert(sound_samples);
     trace_assert(sound_index < sound_samples->samples_count);
     trace_assert(sound_samples->dev);
+    /* Premix the audio volume */
+    memset(sound_samples->active_audio_buf_array[sound_index], 0, sound_samples->audio_buf_size_array[sound_index]);
+
+    //TODO: replace this linear scaling volume with logarithmic scale for better audio perception
+    SDL_MixAudioFormat(sound_samples->active_audio_buf_array[sound_index],
+                       sound_samples->audio_buf_array[sound_index],
+                       AUDIO_F32, //Hardcoded format just like in issue #1023
+                       sound_samples->audio_buf_size_array[sound_index],
+                       (int)((float)SDL_MIX_MAXVOLUME * sound_samples->volume / 100.0f));
+
+    /* Play the audio*/
     SDL_ClearQueuedAudio(sound_samples->dev);
-    if (SDL_QueueAudio(sound_samples->dev, sound_samples->audio_buf_array[sound_index], 
+    if (SDL_QueueAudio(sound_samples->dev, sound_samples->active_audio_buf_array[sound_index],
                 sound_samples->audio_buf_size_array[sound_index]) < 0) {
         log_warn("Failed to queue audio data of sound index %zu to device: %s\n", sound_index, SDL_GetError());
         return 0;
@@ -153,3 +183,10 @@ int sound_samples_toggle_pause(Sound_samples *sound_samples)
     SDL_PauseAudioDevice(sound_samples->dev, sound_samples->paused);
     return 0;
 }
+
+void sound_samples_update_volume(Sound_samples *sound_samples,
+                                 float volume)
+{
+  trace_assert(sound_samples);
+  sound_samples->volume = volume;
+}