From e2339bd54a769e9f1146f3dc7e605392a0825d49 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Thu, 27 Mar 2025 13:15:04 +0100 Subject: [PATCH] actualitzada la versio de jail_audio modificat SDL_Init a SDL_Init(SDL_INIT_VIDEO || SDL_INIT_AUDIO || SDL_INIT_GAMEPAD) --- source/director.cpp | 2 +- source/jail_audio.cpp | 281 +++++++++++++++++++++++------------------- source/jail_audio.h | 37 ++---- 3 files changed, 169 insertions(+), 151 deletions(-) diff --git a/source/director.cpp b/source/director.cpp index 4fe48f0..c4d6135 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -287,7 +287,7 @@ bool Director::initSDL() auto success = true; // Inicializa SDL - if (!SDL_Init(SDL_INIT_VIDEO)) + if (!SDL_Init(SDL_INIT_VIDEO || SDL_INIT_AUDIO || SDL_INIT_GAMEPAD)) { std::cout << "SDL could not initialize!\nSDL Error: " << SDL_GetError() << std::endl; success = false; diff --git a/source/jail_audio.cpp b/source/jail_audio.cpp index 202ef89..c621419 100644 --- a/source/jail_audio.cpp +++ b/source/jail_audio.cpp @@ -1,52 +1,54 @@ #ifndef JA_USESDLMIXER #include "jail_audio.h" -#include // Para SDL_IOFromMem -#include // Para SDL_AddTimer, SDL_RemoveTimer, SDL_Ti... -#include // Para uint32_t, uint8_t -#include // Para NULL, fseek, printf, fclose, fopen -#include // Para free, malloc -#include "stb_vorbis.c" // Para stb_vorbis_decode_memory +#include "stb_vorbis.c" +#include +#include -#define JA_MAX_SIMULTANEOUS_CHANNELS 20 +#define JA_MAX_SIMULTANEOUS_CHANNELS 5 struct JA_Sound_t { - SDL_AudioSpec spec{SDL_AUDIO_S16, 2, 48000}; - Uint32 length{0}; - Uint8 *buffer{NULL}; + SDL_AudioSpec spec { SDL_AUDIO_S16, 2, 48000 }; + Uint32 length { 0 }; + Uint8 *buffer { NULL }; }; struct JA_Channel_t { - JA_Sound_t *sound{nullptr}; - int pos{0}; - int times{0}; - SDL_AudioStream *stream{nullptr}; - JA_Channel_state state{JA_CHANNEL_FREE}; + JA_Sound_t *sound { nullptr }; + int pos { 0 }; + int times { 0 }; + SDL_AudioStream *stream { nullptr }; + JA_Channel_state state { JA_CHANNEL_FREE }; }; struct JA_Music_t { - SDL_AudioSpec spec{SDL_AUDIO_S16, 2, 48000}; - Uint32 length{0}; - Uint8 *buffer{nullptr}; + SDL_AudioSpec spec { SDL_AUDIO_S16, 2, 48000 }; + Uint32 length { 0 }; + Uint8 *buffer { nullptr }; - int pos{0}; - int times{0}; - SDL_AudioStream *stream{nullptr}; - JA_Music_state state{JA_MUSIC_INVALID}; + int pos { 0 }; + int times { 0 }; + SDL_AudioStream *stream { nullptr }; + JA_Music_state state { JA_MUSIC_INVALID }; }; -JA_Music_t *current_music{nullptr}; -JA_Channel_t channels[JA_MAX_SIMULTANEOUS_CHANNELS]; +JA_Music_t *current_music { nullptr }; +JA_Channel_t channels[JA_MAX_SIMULTANEOUS_CHANNELS]; -SDL_AudioSpec JA_audioSpec{SDL_AUDIO_S16, 2, 48000}; -float JA_musicVolume{1.0f}; -float JA_soundVolume{0.5f}; -bool JA_musicEnabled{true}; -bool JA_soundEnabled{true}; -SDL_AudioDeviceID sdlAudioDevice{0}; -SDL_TimerID JA_timerID{0}; +SDL_AudioSpec JA_audioSpec { SDL_AUDIO_S16, 2, 48000 }; +float JA_musicVolume { 1.0f }; +float JA_soundVolume { 0.5f }; +bool JA_musicEnabled { true }; +bool JA_soundEnabled { true }; +SDL_AudioDeviceID sdlAudioDevice { 0 }; +SDL_TimerID JA_timerID { 0 }; + +bool fading = false; +int fade_start_time; +int fade_duration; +int fade_initial_volume; /* void audioCallback(void * userdata, uint8_t * stream, int len) { @@ -90,38 +92,48 @@ Uint32 JA_UpdateCallback(void *userdata, SDL_TimerID timerID, Uint32 interval) { if (JA_musicEnabled && current_music && current_music->state == JA_MUSIC_PLAYING) { + if (fading) { + int time = SDL_GetTicks(); + if (time > (fade_start_time+fade_duration)) { + fading = false; + JA_StopMusic(); + } else { + const int time_passed = time - fade_start_time; + const float percent = (float)time_passed / (float)fade_duration; + SDL_SetAudioStreamGain(current_music->stream, 1.0 - percent); + } + } + if (current_music->times != 0) { - if (SDL_GetAudioStreamAvailable(current_music->stream) < static_cast(current_music->length / 2)) + if (SDL_GetAudioStreamAvailable(current_music->stream) < (current_music->length/2)) { SDL_PutAudioStreamData(current_music->stream, current_music->buffer, current_music->length); - if (current_music->times > 0) - current_music->times--; + } + if (current_music->times>0) current_music->times--; } else { - if (SDL_GetAudioStreamAvailable(current_music->stream) == 0) - JA_StopMusic(); + if (SDL_GetAudioStreamAvailable(current_music->stream) == 0) JA_StopMusic(); } } if (JA_soundEnabled) { - for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; ++i) + for (int i=0; i < JA_MAX_SIMULTANEOUS_CHANNELS; ++i) if (channels[i].state == JA_CHANNEL_PLAYING) { if (channels[i].times != 0) { - if (SDL_GetAudioStreamAvailable(channels[i].stream) < static_cast(channels[i].sound->length / 2)) + if (SDL_GetAudioStreamAvailable(channels[i].stream) < (channels[i].sound->length/2)) SDL_PutAudioStreamData(channels[i].stream, channels[i].sound->buffer, channels[i].sound->length); - if (channels[i].times > 0) - channels[i].times--; + if (channels[i].times>0) channels[i].times--; } } else { - if (SDL_GetAudioStreamAvailable(channels[i].stream) == 0) - JA_StopChannel(i); + if (SDL_GetAudioStreamAvailable(channels[i].stream) == 0) JA_StopChannel(i); } + } return 30; @@ -129,25 +141,28 @@ Uint32 JA_UpdateCallback(void *userdata, SDL_TimerID timerID, Uint32 interval) void JA_Init(const int freq, const SDL_AudioFormat format, const int channels) { - JA_audioSpec = {format, channels, freq}; - if (!sdlAudioDevice) - SDL_CloseAudioDevice(sdlAudioDevice); + #ifdef DEBUG + SDL_SetLogPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_DEBUG); + #endif + + SDL_Log("Iniciant JailAudio..."); + JA_audioSpec = {format, channels, freq }; + if (!sdlAudioDevice) SDL_CloseAudioDevice(sdlAudioDevice); sdlAudioDevice = SDL_OpenAudioDevice(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &JA_audioSpec); + SDL_Log( (sdlAudioDevice==0) ? "Failed to initialize SDL audio!\n" : "OK!\n"); SDL_PauseAudioDevice(sdlAudioDevice); JA_timerID = SDL_AddTimer(30, JA_UpdateCallback, nullptr); } void JA_Quit() { - if (JA_timerID) - SDL_RemoveTimer(JA_timerID); + if (JA_timerID) SDL_RemoveTimer(JA_timerID); - if (!sdlAudioDevice) - SDL_CloseAudioDevice(sdlAudioDevice); + if (!sdlAudioDevice) SDL_CloseAudioDevice(sdlAudioDevice); sdlAudioDevice = 0; } -JA_Music_t *JA_LoadMusic(Uint8 *buffer, Uint32 length) +JA_Music_t *JA_LoadMusic(Uint8* buffer, Uint32 length) { JA_Music_t *music = new JA_Music_t(); @@ -158,25 +173,24 @@ JA_Music_t *JA_LoadMusic(Uint8 *buffer, Uint32 length) music->spec.channels = chan; music->spec.freq = samplerate; music->spec.format = SDL_AUDIO_S16; - music->buffer = (Uint8 *)SDL_malloc(music->length); + music->buffer = (Uint8*)SDL_malloc(music->length); SDL_memcpy(music->buffer, output, music->length); - SDL_free(output); + free(output); music->pos = 0; music->state = JA_MUSIC_STOPPED; return music; } -JA_Music_t *JA_LoadMusic(const char *filename) +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); long fsize = ftell(f); fseek(f, 0, SEEK_SET); - Uint8 *buffer = (Uint8 *)malloc(fsize + 1); - if (fread(buffer, fsize, 1, f) != 1) - return NULL; + Uint8 *buffer = (Uint8*)malloc(fsize + 1); + if (fread(buffer, fsize, 1, f)!=1) return NULL; fclose(f); JA_Music_t *music = JA_LoadMusic(buffer, fsize); @@ -188,33 +202,26 @@ JA_Music_t *JA_LoadMusic(const char *filename) void JA_PlayMusic(JA_Music_t *music, const int loop) { - if (!JA_musicEnabled) - return; + if (!JA_musicEnabled) return; + + JA_StopMusic(); - if (current_music != NULL) - { - current_music->pos = 0; - current_music->state = JA_MUSIC_STOPPED; - } current_music = music; current_music->pos = 0; current_music->state = JA_MUSIC_PLAYING; current_music->times = loop; current_music->stream = SDL_CreateAudioStream(¤t_music->spec, &JA_audioSpec); - if (!SDL_PutAudioStreamData(current_music->stream, current_music->buffer, current_music->length)) - printf("[ERROR] SDL_PutAudioStreamData failed!\n"); + if (!SDL_PutAudioStreamData(current_music->stream, current_music->buffer, current_music->length)) printf("[ERROR] SDL_PutAudioStreamData failed!\n"); SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume); - if (!SDL_BindAudioStream(sdlAudioDevice, current_music->stream)) - printf("[ERROR] SDL_BindAudioStream failed!\n"); + if (!SDL_BindAudioStream(sdlAudioDevice, current_music->stream)) printf("[ERROR] SDL_BindAudioStream failed!\n"); + SDL_ResumeAudioStreamDevice(current_music->stream); } void JA_PauseMusic() { - if (!JA_musicEnabled) - return; - if (!current_music || current_music->state == JA_MUSIC_INVALID) - return; + if (!JA_musicEnabled) return; + if (!current_music || current_music->state == JA_MUSIC_INVALID) return; current_music->state = JA_MUSIC_PAUSED; SDL_PauseAudioStreamDevice(current_music->stream); @@ -222,10 +229,8 @@ void JA_PauseMusic() void JA_ResumeMusic() { - if (!JA_musicEnabled) - return; - if (!current_music || current_music->state == JA_MUSIC_INVALID) - return; + if (!JA_musicEnabled) return; + if (!current_music || current_music->state == JA_MUSIC_INVALID) return; current_music->state = JA_MUSIC_PLAYING; SDL_ResumeAudioStreamDevice(current_music->stream); @@ -233,10 +238,8 @@ void JA_ResumeMusic() void JA_StopMusic() { - if (!JA_musicEnabled) - return; - if (!current_music || current_music->state == JA_MUSIC_INVALID) - return; + if (!JA_musicEnabled) return; + if (!current_music || current_music->state == JA_MUSIC_INVALID) return; current_music->pos = 0; current_music->state = JA_MUSIC_STOPPED; @@ -245,42 +248,64 @@ void JA_StopMusic() current_music->stream = nullptr; } +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) - return JA_MUSIC_INVALID; + if (!JA_musicEnabled) return JA_MUSIC_DISABLED; + if (!current_music) return JA_MUSIC_INVALID; return current_music->state; } void JA_DeleteMusic(JA_Music_t *music) { - if (current_music == music) - current_music = nullptr; + if (current_music == music) current_music = nullptr; SDL_free(music->buffer); - SDL_DestroyAudioStream(music->stream); + if (music->stream) SDL_DestroyAudioStream(music->stream); delete music; } float JA_SetMusicVolume(float volume) { - JA_musicVolume = SDL_clamp(volume, 0.0f, 1.0f); - if (current_music) - SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume); + JA_musicVolume = SDL_clamp( volume, 0.0f, 1.0f ); + if (current_music) SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume); return JA_musicVolume; } +void JA_SetMusicPosition(float value) +{ + if (!current_music) return; + current_music->pos = value * current_music->spec.freq; +} + +float JA_GetMusicPosition() +{ + if (!current_music) return 0; + return float(current_music->pos)/float(current_music->spec.freq); +} + void JA_EnableMusic(const bool value) { - if (!value && current_music && (current_music->state == JA_MUSIC_PLAYING)) - JA_StopMusic(); + if ( !value && current_music && (current_music->state==JA_MUSIC_PLAYING) ) JA_StopMusic(); JA_musicEnabled = value; } -JA_Sound_t *JA_NewSound(Uint8 *buffer, Uint32 length) + + + + +JA_Sound_t *JA_NewSound(Uint8* buffer, Uint32 length) { JA_Sound_t *sound = new JA_Sound_t(); sound->buffer = buffer; @@ -288,15 +313,15 @@ 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 *JA_LoadSound(uint8_t* buffer, uint32_t size) { JA_Sound_t *sound = new JA_Sound_t(); - SDL_LoadWAV_IO(SDL_IOFromMem(buffer, size), 1, &sound->spec, &sound->buffer, &sound->length); + SDL_LoadWAV_IO(SDL_IOFromMem(buffer, size),1, &sound->spec, &sound->buffer, &sound->length); return sound; } -JA_Sound_t *JA_LoadSound(const char *filename) +JA_Sound_t *JA_LoadSound(const char* filename) { JA_Sound_t *sound = new JA_Sound_t(); SDL_LoadWAV(filename, &sound->spec, &sound->buffer, &sound->length); @@ -306,16 +331,31 @@ JA_Sound_t *JA_LoadSound(const char *filename) int JA_PlaySound(JA_Sound_t *sound, const int loop) { - if (!JA_soundEnabled) - return -1; + 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; + while (channel < JA_MAX_SIMULTANEOUS_CHANNELS && channels[channel].state != JA_CHANNEL_FREE) { channel++; } + if (channel == JA_MAX_SIMULTANEOUS_CHANNELS) channel = 0; + JA_StopChannel(channel); + + channels[channel].sound = sound; + channels[channel].times = loop; + channels[channel].pos = 0; + channels[channel].state = JA_CHANNEL_PLAYING; + channels[channel].stream = SDL_CreateAudioStream(&channels[channel].sound->spec, &JA_audioSpec); + SDL_PutAudioStreamData(channels[channel].stream, channels[channel].sound->buffer, channels[channel].sound->length); + SDL_SetAudioStreamGain(channels[channel].stream, JA_soundVolume); + SDL_BindAudioStream(sdlAudioDevice, channels[channel].stream); + + return channel; +} + +int JA_PlaySoundOnChannel(JA_Sound_t *sound, const int channel, const int loop) +{ + if (!JA_soundEnabled) return -1; + + if (channel < 0 || channel >= JA_MAX_SIMULTANEOUS_CHANNELS) return -1; + JA_StopChannel(channel); channels[channel].sound = sound; channels[channel].times = loop; @@ -331,10 +371,8 @@ int JA_PlaySound(JA_Sound_t *sound, const int loop) 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); + for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) { + if (channels[i].sound == sound) JA_StopChannel(i); } SDL_free(sound->buffer); delete sound; @@ -342,8 +380,7 @@ void JA_DeleteSound(JA_Sound_t *sound) void JA_PauseChannel(const int channel) { - if (!JA_soundEnabled) - return; + if (!JA_soundEnabled) return; if (channel == -1) { @@ -366,8 +403,7 @@ void JA_PauseChannel(const int channel) void JA_ResumeChannel(const int channel) { - if (!JA_soundEnabled) - return; + if (!JA_soundEnabled) return; if (channel == -1) { @@ -390,45 +426,41 @@ void JA_ResumeChannel(const int channel) void JA_StopChannel(const int channel) { - if (!JA_soundEnabled) - return; + if (!JA_soundEnabled) return; if (channel == -1) { - for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) - { + for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) { + if (channels[i].state != JA_CHANNEL_FREE) SDL_DestroyAudioStream(channels[i].stream); channels[i].state = JA_CHANNEL_FREE; channels[i].pos = 0; channels[i].sound = NULL; - SDL_DestroyAudioStream(channels[i].stream); } } else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS) { + if (channels[channel].state != JA_CHANNEL_FREE) SDL_DestroyAudioStream(channels[channel].stream); channels[channel].state = JA_CHANNEL_FREE; channels[channel].pos = 0; channels[channel].sound = NULL; - SDL_DestroyAudioStream(channels[channel].stream); } } JA_Channel_state JA_GetChannelState(const int channel) { - if (!JA_soundEnabled) - return JA_SOUND_DISABLED; + if (!JA_soundEnabled) return JA_SOUND_DISABLED; - if (channel < 0 || channel >= JA_MAX_SIMULTANEOUS_CHANNELS) - return JA_CHANNEL_INVALID; + if (channel < 0 || channel >= JA_MAX_SIMULTANEOUS_CHANNELS) return JA_CHANNEL_INVALID; return channels[channel].state; } float JA_SetSoundVolume(float volume) { - JA_soundVolume = SDL_clamp(volume, 0.0f, 1.0f); + JA_soundVolume = SDL_clamp( volume, 0.0f, 1.0f ); for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) - if ((channels[i].state == JA_CHANNEL_PLAYING) || (channels[i].state == JA_CHANNEL_PAUSED)) + if ( (channels[i].state == JA_CHANNEL_PLAYING) || (channels[i].state == JA_CHANNEL_PAUSED) ) SDL_SetAudioStreamGain(channels[i].stream, JA_soundVolume); return JA_soundVolume; @@ -438,8 +470,7 @@ 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); + if (channels[i].state == JA_CHANNEL_PLAYING) JA_StopChannel(i); } JA_soundEnabled = value; } diff --git a/source/jail_audio.h b/source/jail_audio.h index d2eb99d..53e1a0f 100644 --- a/source/jail_audio.h +++ b/source/jail_audio.h @@ -1,25 +1,8 @@ #pragma once -#include // Para SDL_AudioFormat -#include // Para Uint32, Uint8 -struct JA_Music_t; // lines 22-22 -struct JA_Sound_t; // lines 21-21 +#include -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 -}; +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; @@ -27,21 +10,25 @@ struct JA_Music_t; 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); +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); float JA_SetMusicVolume(float 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); +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);