From 370120345e8ae3de8cbd75e7c14f0585d014b612 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Fri, 21 Feb 2025 12:33:08 +0100 Subject: [PATCH] Actualitzat jail_audio --- source/jail_audio.cpp | 250 ++++++++++++++++++++++++++++++++++-------- source/jail_audio.h | 22 +++- 2 files changed, 224 insertions(+), 48 deletions(-) diff --git a/source/jail_audio.cpp b/source/jail_audio.cpp index 42907fe..04a793d 100644 --- a/source/jail_audio.cpp +++ b/source/jail_audio.cpp @@ -1,10 +1,14 @@ #ifndef JA_USESDLMIXER #include "jail_audio.h" -#include "stb_vorbis.c" -#include -#include +#include // for SDL_Log, SDL_LogSetPriority, SDL_LOG_CAT... +#include // for SDL_RWFromMem +#include // for SDL_GetTicks +#include // for uint8_t, uint32_t +#include // for NULL, fseek, fclose, fopen, fread, ftell +#include // for free, malloc +#include "stb_vorbis.c" // for stb_vorbis_decode_memory -#define JA_MAX_SIMULTANEOUS_CHANNELS 5 +constexpr int JA_MAX_SIMULTANEOUS_CHANNELS = 20; struct JA_Sound_t { Uint32 length {0}; @@ -20,6 +24,7 @@ struct JA_Channel_t { struct JA_Music_t { int samples {0}; + Uint32 length {0}; int pos {0}; int times {0}; short* output {NULL}; @@ -32,19 +37,41 @@ JA_Channel_t channels[JA_MAX_SIMULTANEOUS_CHANNELS]; int JA_freq {48000}; SDL_AudioFormat JA_format {AUDIO_S16}; Uint8 JA_channels {2}; -int JA_volume = 128; +int JA_musicVolume = 128; +int JA_soundVolume = 64; +bool JA_musicEnabled = true; +bool JA_soundEnabled = true; SDL_AudioDeviceID sdlAudioDevice = 0; +bool fading = false; +int fade_start_time; +int fade_duration; +int fade_initial_volume; + void audioCallback(void * userdata, uint8_t * stream, int len) { SDL_memset(stream, 0, len); if (current_music != NULL && current_music->state == JA_MUSIC_PLAYING) { - const int size = SDL_min(len, current_music->samples*2-current_music->pos); - SDL_MixAudioFormat(stream, (Uint8*)(current_music->output+current_music->pos), AUDIO_S16, size, JA_volume); - current_music->pos += size/2; + int volume = JA_musicVolume; + if (fading) { + int time = SDL_GetTicks(); + if (time > (fade_start_time+fade_duration)) { + fading = false; + current_music->pos = 0; + current_music->state = JA_MUSIC_STOPPED; + volume = 0; + } else { + const int time_passed = time - fade_start_time; + const float percent = (float)time_passed / (float)fade_duration; + volume = JA_musicVolume * (1.0 - percent); + } + } + const int size = SDL_min(len, current_music->length - current_music->pos); + SDL_MixAudioFormat(stream, (Uint8*)(current_music->output)+current_music->pos, AUDIO_S16, size, volume); + current_music->pos += size; if (size < len) { if (current_music->times != 0) { - SDL_MixAudioFormat(stream+size, (Uint8*)current_music->output, AUDIO_S16, len-size, JA_volume); - current_music->pos = (len-size)/2; + SDL_MixAudioFormat(stream+size, (Uint8*)current_music->output, AUDIO_S16, len-size, volume); + current_music->pos = len-size; if (current_music->times > 0) current_music->times--; } else { current_music->pos = 0; @@ -56,11 +83,11 @@ void audioCallback(void * userdata, uint8_t * stream, int len) { for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) { if (channels[i].state == JA_CHANNEL_PLAYING) { const int size = SDL_min(len, channels[i].sound->length - channels[i].pos); - SDL_MixAudioFormat(stream, channels[i].sound->buffer + channels[i].pos, AUDIO_S16, size, JA_volume/2); + SDL_MixAudioFormat(stream, channels[i].sound->buffer + channels[i].pos, AUDIO_S16, size, JA_soundVolume); channels[i].pos += size; if (size < len) { if (channels[i].times != 0) { - SDL_MixAudioFormat(stream + size, channels[i].sound->buffer, AUDIO_S16, len-size, JA_volume/2); + SDL_MixAudioFormat(stream + size, channels[i].sound->buffer, AUDIO_S16, len-size, JA_soundVolume); channels[i].pos = len-size; if (channels[i].times > 0) channels[i].times--; } else { @@ -71,13 +98,19 @@ void audioCallback(void * userdata, uint8_t * stream, int len) { } } -void JA_Init(const int freq, const SDL_AudioFormat format, const int channels) { +void JA_Init(const int freq, const SDL_AudioFormat format, const int channels) +{ + #ifdef DEBUG + SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_DEBUG); + #endif + JA_freq = freq; JA_format = format; JA_channels = channels; SDL_AudioSpec audioSpec{JA_freq, JA_format, JA_channels, 0, 1024, 0, 0, audioCallback, NULL}; if (sdlAudioDevice != 0) SDL_CloseAudioDevice(sdlAudioDevice); sdlAudioDevice = SDL_OpenAudioDevice(NULL, 0, &audioSpec, NULL, 0); + SDL_PauseAudioDevice(sdlAudioDevice, 0); } @@ -87,9 +120,35 @@ void JA_Quit() { sdlAudioDevice = 0; } -JA_Music_t *JA_LoadMusic(const char* filename) { +JA_Music_t *JA_LoadMusic(Uint8* buffer, Uint32 length) +{ int chan, samplerate; + JA_Music_t *music = new JA_Music_t(); + music->samples = stb_vorbis_decode_memory(buffer, length, &chan, &samplerate, &music->output); + // [RZC 28/08/22] Abans el descomprimiem mentre el teniem obert +// music->samples = stb_vorbis_decode_filename(filename, &chan, &samplerate, &music->output); + + SDL_AudioCVT cvt; + SDL_BuildAudioCVT(&cvt, AUDIO_S16, chan, samplerate, JA_format, JA_channels, JA_freq); + if (cvt.needed) { + cvt.len = music->samples * chan * 2; + music->length = cvt.len; + cvt.buf = (Uint8 *) SDL_malloc(cvt.len * cvt.len_mult); + SDL_memcpy(cvt.buf, music->output, cvt.len); + SDL_ConvertAudio(&cvt); + free(music->output); + music->output = (short*)cvt.buf; + } + music->length = music->samples * chan * 2; + music->pos = 0; + music->state = JA_MUSIC_STOPPED; + + return music; +} + +JA_Music_t *JA_LoadMusic(const char* filename) +{ // [RZC 28/08/22] Carreguem primer el arxiu en memòria i després el descomprimim. Es algo més rapid. FILE *f = fopen(filename, "rb"); fseek(f, 0, SEEK_END); @@ -99,30 +158,17 @@ JA_Music_t *JA_LoadMusic(const char* filename) { if (fread(buffer, fsize, 1, f)!=1) return NULL; fclose(f); - JA_Music_t *music = new JA_Music_t(); + JA_Music_t *music = JA_LoadMusic(buffer, fsize); - music->samples = stb_vorbis_decode_memory(buffer, fsize, &chan, &samplerate, &music->output); free(buffer); - // [RZC 28/08/22] Abans el descomprimiem mentre el teniem obert -// music->samples = stb_vorbis_decode_filename(filename, &chan, &samplerate, &music->output); - - SDL_AudioCVT cvt; - SDL_BuildAudioCVT(&cvt, AUDIO_S16, chan, samplerate, JA_format, JA_channels, JA_freq); - if (cvt.needed) { - cvt.len = music->samples * chan * 2; - cvt.buf = (Uint8 *) SDL_malloc(cvt.len * cvt.len_mult); - SDL_memcpy(cvt.buf, music->output, cvt.len); - SDL_ConvertAudio(&cvt); - free(music->output); - music->output = (short*)cvt.buf; - } - music->pos = 0; - music->state = JA_MUSIC_STOPPED; return music; } -void JA_PlayMusic(JA_Music_t *music, const int loop) { +void JA_PlayMusic(JA_Music_t *music, const int loop) +{ + if (!JA_musicEnabled) return; + if (current_music != NULL) { current_music->pos = 0; current_music->state = JA_MUSIC_STOPPED; @@ -133,23 +179,45 @@ void JA_PlayMusic(JA_Music_t *music, const int loop) { current_music->times = loop; } -void JA_PauseMusic() { +void JA_PauseMusic() +{ + if (!JA_musicEnabled) return; + if (current_music == NULL || current_music->state == JA_MUSIC_INVALID) return; current_music->state = JA_MUSIC_PAUSED; } -void JA_ResumeMusic() { +void JA_ResumeMusic() +{ + if (!JA_musicEnabled) return; + if (current_music == NULL || current_music->state == JA_MUSIC_INVALID) return; current_music->state = JA_MUSIC_PLAYING; } -void JA_StopMusic() { +void JA_StopMusic() +{ + if (!JA_musicEnabled) return; + if (current_music == NULL || current_music->state == JA_MUSIC_INVALID) return; current_music->pos = 0; current_music->state = JA_MUSIC_STOPPED; } +void JA_FadeOutMusic(const int milliseconds) +{ + if (!JA_musicEnabled) return; + if (current_music == NULL || current_music->state == JA_MUSIC_INVALID) return; + + fading = true; + fade_start_time = SDL_GetTicks(); + fade_duration = milliseconds; + fade_initial_volume = JA_musicVolume; +} + JA_Music_state JA_GetMusicState() { + if (!JA_musicEnabled) return JA_MUSIC_DISABLED; + if (current_music == NULL) return JA_MUSIC_INVALID; return current_music->state; } @@ -160,6 +228,35 @@ void JA_DeleteMusic(JA_Music_t *music) { delete music; } +int JA_SetMusicVolume(int volume) +{ + JA_musicVolume = volume > 128 ? 128 : volume < 0 ? 0 : volume; + return JA_musicVolume; +} + +void JA_SetMusicPosition(float value) +{ + if (!current_music) return; + current_music->pos = value * JA_freq; +} + +float JA_GetMusicPosition() +{ + if (!current_music) return 0; + return float(current_music->pos)/float(JA_freq); +} + +void JA_EnableMusic(const bool value) +{ + if (!value && current_music != NULL && current_music->state==JA_MUSIC_PLAYING) JA_StopMusic(); + + JA_musicEnabled = value; +} + + + + + JA_Sound_t *JA_NewSound(Uint8* buffer, Uint32 length) { JA_Sound_t *sound = new JA_Sound_t(); sound->buffer = buffer; @@ -167,6 +264,24 @@ JA_Sound_t *JA_NewSound(Uint8* buffer, Uint32 length) { return sound; } +JA_Sound_t *JA_LoadSound(uint8_t* buffer, uint32_t size) { + JA_Sound_t *sound = new JA_Sound_t(); + SDL_AudioSpec wavSpec; + SDL_LoadWAV_RW(SDL_RWFromMem(buffer, size),1, &wavSpec, &sound->buffer, &sound->length); + + SDL_AudioCVT cvt; + SDL_BuildAudioCVT(&cvt, wavSpec.format, wavSpec.channels, wavSpec.freq, JA_format, JA_channels, JA_freq); + cvt.len = sound->length; + cvt.buf = (Uint8 *) SDL_malloc(cvt.len * cvt.len_mult); + SDL_memcpy(cvt.buf, sound->buffer, sound->length); + SDL_ConvertAudio(&cvt); + SDL_FreeWAV(sound->buffer); + sound->buffer = cvt.buf; + sound->length = cvt.len_cvt; + + return sound; +} + JA_Sound_t *JA_LoadSound(const char* filename) { JA_Sound_t *sound = new JA_Sound_t(); SDL_AudioSpec wavSpec; @@ -185,7 +300,10 @@ JA_Sound_t *JA_LoadSound(const char* filename) { return sound; } -int JA_PlaySound(JA_Sound_t *sound, const int loop) { +int JA_PlaySound(JA_Sound_t *sound, const int loop) +{ + if (!JA_soundEnabled) return -1; + int channel = 0; while (channel < JA_MAX_SIMULTANEOUS_CHANNELS && channels[channel].state != JA_CHANNEL_FREE) { channel++; } if (channel == JA_MAX_SIMULTANEOUS_CHANNELS) channel = 0; @@ -197,7 +315,21 @@ int JA_PlaySound(JA_Sound_t *sound, const int loop) { return channel; } -void JA_DeleteSound(JA_Sound_t *sound) { +int JA_PlaySoundOnChannel(JA_Sound_t *sound, const int channel, const int loop) +{ + if (!JA_soundEnabled) return -1; + + if (channel >= JA_MAX_SIMULTANEOUS_CHANNELS) return -1; + + channels[channel].sound = sound; + channels[channel].times = loop; + channels[channel].pos = 0; + channels[channel].state = JA_CHANNEL_PLAYING; + return channel; +} + +void JA_DeleteSound(JA_Sound_t *sound) +{ for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) { if (channels[i].sound == sound) JA_StopChannel(i); } @@ -205,7 +337,10 @@ void JA_DeleteSound(JA_Sound_t *sound) { delete sound; } -void JA_PauseChannel(const int channel) { +void JA_PauseChannel(const int channel) +{ + if (!JA_soundEnabled) return; + if (channel == -1) { for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) { if (channels[i].state == JA_CHANNEL_PLAYING) channels[i].state = JA_CHANNEL_PAUSED; @@ -215,7 +350,10 @@ void JA_PauseChannel(const int channel) { } } -void JA_ResumeChannel(const int channel) { +void JA_ResumeChannel(const int channel) +{ + if (!JA_soundEnabled) return; + if (channel == -1) { for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) { if (channels[i].state == JA_CHANNEL_PAUSED) channels[i].state = JA_CHANNEL_PLAYING; @@ -225,7 +363,10 @@ void JA_ResumeChannel(const int channel) { } } -void JA_StopChannel(const int channel) { +void JA_StopChannel(const int channel) +{ + if (!JA_soundEnabled) return; + if (channel == -1) { for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) { channels[i].state = JA_CHANNEL_FREE; @@ -239,13 +380,34 @@ void JA_StopChannel(const int channel) { } } -JA_Channel_state JA_GetChannelState(const int channel) { +JA_Channel_state JA_GetChannelState(const int channel) +{ + if (!JA_soundEnabled) return JA_SOUND_DISABLED; + if (channel < 0 || channel >= JA_MAX_SIMULTANEOUS_CHANNELS) return JA_CHANNEL_INVALID; return channels[channel].state; } -int JA_SetVolume(int volume) { - JA_volume = volume > 128 ? 128 : volume < 0 ? 0 : volume; - return JA_volume; +int JA_SetSoundVolume(int volume) +{ + JA_soundVolume = volume > 128 ? 128 : volume < 0 ? 0 : volume; + return JA_soundVolume; } + +void JA_EnableSound(const bool value) +{ + for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) + { + if (channels[i].state == JA_CHANNEL_PLAYING) JA_StopChannel(i); + } + JA_soundEnabled = value; +} + +int JA_SetVolume(int volume) +{ + JA_musicVolume = volume > 128 ? 128 : volume < 0 ? 0 : volume; + JA_soundVolume = JA_musicVolume/2; + return JA_musicVolume; +} + #endif \ No newline at end of file diff --git a/source/jail_audio.h b/source/jail_audio.h index 4c4d7f9..f51135c 100644 --- a/source/jail_audio.h +++ b/source/jail_audio.h @@ -1,8 +1,12 @@ #pragma once -#include -enum JA_Channel_state { JA_CHANNEL_INVALID, JA_CHANNEL_FREE, JA_CHANNEL_PLAYING, JA_CHANNEL_PAUSED }; -enum JA_Music_state { JA_MUSIC_INVALID, JA_MUSIC_PLAYING, JA_MUSIC_PAUSED, JA_MUSIC_STOPPED }; +#include // for SDL_AudioFormat +#include // for Uint32, Uint8 +struct JA_Music_t; // lines 8-8 +struct JA_Sound_t; // lines 7-7 + +enum JA_Channel_state { JA_CHANNEL_INVALID, JA_CHANNEL_FREE, JA_CHANNEL_PLAYING, JA_CHANNEL_PAUSED, JA_SOUND_DISABLED }; +enum JA_Music_state { JA_MUSIC_INVALID, JA_MUSIC_PLAYING, JA_MUSIC_PAUSED, JA_MUSIC_STOPPED, JA_MUSIC_DISABLED }; struct JA_Sound_t; struct JA_Music_t; @@ -11,20 +15,30 @@ void JA_Init(const int freq, const SDL_AudioFormat format, const int channels); void JA_Quit(); JA_Music_t *JA_LoadMusic(const char* filename); +JA_Music_t *JA_LoadMusic(Uint8* buffer, Uint32 length); void JA_PlayMusic(JA_Music_t *music, const int loop = -1); void JA_PauseMusic(); void JA_ResumeMusic(); void JA_StopMusic(); +void JA_FadeOutMusic(const int milliseconds); JA_Music_state JA_GetMusicState(); void JA_DeleteMusic(JA_Music_t *music); +int JA_SetMusicVolume(int volume); +void JA_SetMusicPosition(float value); +float JA_GetMusicPosition(); +void JA_EnableMusic(const bool value); JA_Sound_t *JA_NewSound(Uint8* buffer, Uint32 length); +JA_Sound_t *JA_LoadSound(Uint8* buffer, Uint32 length); JA_Sound_t *JA_LoadSound(const char* filename); int JA_PlaySound(JA_Sound_t *sound, const int loop = 0); +int JA_PlaySoundOnChannel(JA_Sound_t *sound, const int channel, const int loop = 0); void JA_PauseChannel(const int channel); void JA_ResumeChannel(const int channel); void JA_StopChannel(const int channel); JA_Channel_state JA_GetChannelState(const int channel); void JA_DeleteSound(JA_Sound_t *sound); +int JA_SetSoundVolume(int volume); +void JA_EnableSound(const bool value); -int JA_SetVolume(int volume); \ No newline at end of file +int JA_SetVolume(int volume);