From e34d22c8dd0d394566f254a674edbfdd1e4cbce6 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Tue, 1 Jul 2025 20:32:02 +0200 Subject: [PATCH] =?UTF-8?q?jail=5Faudio:=20ultima=20versi=C3=B3=20Audio:?= =?UTF-8?q?=20separaci=C3=B3=20de=20sons=20per=20canals=20Game:=20el=20fad?= =?UTF-8?q?e=20de=20so=20de=20game=20over=20ja=20no=20afecta=20al=20so=20d?= =?UTF-8?q?e=20la=20UI=20(no=20funciona=20o=20no=20ho=20faig=20be)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/audio.cpp | 8 +- source/audio.h | 15 +- source/external/jail_audio.cpp | 332 +++++++++++++-------------------- source/external/jail_audio.h | 7 +- source/notifier.cpp | 2 +- source/sections/game.cpp | 4 +- source/ui/service_menu.cpp | 8 +- 7 files changed, 158 insertions(+), 218 deletions(-) diff --git a/source/audio.cpp b/source/audio.cpp index 32afe9f..c957b6f 100644 --- a/source/audio.cpp +++ b/source/audio.cpp @@ -56,11 +56,11 @@ void Audio::stopMusic() } // Reproduce un sonido -void Audio::playSound(const std::string &name) +void Audio::playSound(const std::string &name, Group group) { if (sound_enabled_) { - JA_PlaySound(Resource::get()->getSound(name)); + JA_PlaySound(Resource::get()->getSound(name), 0 , static_cast(group)); } } @@ -83,13 +83,13 @@ void Audio::fadeOutMusic(int milliseconds) } // Establece el volumen de los sonidos -void Audio::setSoundVolume(int sound_volume) +void Audio::setSoundVolume(int sound_volume, Group group) { if (sound_enabled_) { sound_volume = std::clamp(sound_volume, 0, 100); const float CONVERTED_VOLUME = (sound_volume / 100.0f) * (Options::audio.volume / 100.0f); - JA_SetSoundVolume(CONVERTED_VOLUME); + JA_SetSoundVolume(CONVERTED_VOLUME, static_cast(group)); } } diff --git a/source/audio.h b/source/audio.h index ce5acec..719172e 100644 --- a/source/audio.h +++ b/source/audio.h @@ -6,6 +6,13 @@ class Audio { public: + enum class Group : int + { + ALL = -1, + GAME = 0, + INTERFACE = 1 + }; + // --- Métodos de singleton --- static void init(); // Inicializa el objeto Audio static void destroy(); // Libera el objeto Audio @@ -18,8 +25,8 @@ public: void fadeOutMusic(int milliseconds); // Fundido de salida de la música // --- Control de Sonidos --- - void playSound(const std::string &name); // Reproducir sonido puntual - void stopAllSounds(); // Detener todos los sonidos + void playSound(const std::string &name, Group group = Group::GAME); // Reproducir sonido puntual + void stopAllSounds(); // Detener todos los sonidos // --- Configuración General --- void enable(bool value); // Establecer estado general @@ -39,8 +46,8 @@ public: void toggleMusic() { music_enabled_ = !music_enabled_; } // Alternar estado de música // --- Control de Volumen --- - void setSoundVolume(int volume); // Ajustar volumen de efectos - void setMusicVolume(int volume); // Ajustar volumen de música + void setSoundVolume(int volume, Group group = Group::ALL); // Ajustar volumen de efectos + void setMusicVolume(int volume); // Ajustar volumen de música private: enum class MusicState diff --git a/source/external/jail_audio.cpp b/source/external/jail_audio.cpp index e2ba368..25da986 100644 --- a/source/external/jail_audio.cpp +++ b/source/external/jail_audio.cpp @@ -5,146 +5,103 @@ #include #define JA_MAX_SIMULTANEOUS_CHANNELS 20 +#define JA_MAX_GROUPS 2 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 }; + int group { 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 }; + char *filename { 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[JA_MAX_GROUPS]; +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) { - 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_musicVolume); - current_music->pos += size/2; - if (size < len) { - if (current_music->times != 0) { - SDL_MixAudioFormat(stream+size, (Uint8*)current_music->output, AUDIO_S16, len-size, JA_musicVolume); - current_music->pos = (len-size)/2; - if (current_music->times > 0) current_music->times--; - } else { - current_music->pos = 0; - current_music->state = JA_MUSIC_STOPPED; - } - } - } - // Mixar els channels mi amol - 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_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_soundVolume); - channels[i].pos = len-size; - if (channels[i].times > 0) channels[i].times--; - } else { - JA_StopChannel(i); - } - } - } - } -} -*/ Uint32 JA_UpdateCallback(void *userdata, SDL_TimerID timerID, Uint32 interval) { if (JA_musicEnabled && current_music && current_music->state == JA_MUSIC_PLAYING) { - if (fading) - { + if (fading) { int time = SDL_GetTicks(); - if (time > (fade_start_time + fade_duration)) - { + if (time > (fade_start_time+fade_duration)) { fading = false; JA_StopMusic(); return 30; - } - else - { + } else { const int time_passed = time - fade_start_time; const float percent = (float)time_passed / (float)fade_duration; - SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume * (1.0 - percent)); + SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume*(1.0 - percent)); } } if (current_music->times != 0) { - if ((Uint32)SDL_GetAudioStreamAvailable(current_music->stream) < (current_music->length / 2)) - { + if ((Uint32)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 ((Uint32)SDL_GetAudioStreamAvailable(channels[i].stream) < (channels[i].sound->length / 2)) - { + if ((Uint32)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; @@ -152,33 +109,30 @@ Uint32 JA_UpdateCallback(void *userdata, SDL_TimerID timerID, Uint32 interval) void JA_Init(const int freq, const SDL_AudioFormat format, const int num_channels) { -#ifdef DEBUG + #ifdef DEBUG SDL_SetLogPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_DEBUG); -#endif - + #endif + SDL_Log("Iniciant JailAudio..."); - JA_audioSpec = {format, num_channels, freq}; - if (!sdlAudioDevice) - SDL_CloseAudioDevice(sdlAudioDevice); + JA_audioSpec = {format, num_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"); - for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; ++i) - channels[i].state = JA_CHANNEL_FREE; - // SDL_PauseAudioDevice(sdlAudioDevice); + SDL_Log( (sdlAudioDevice==0) ? "Failed to initialize SDL audio!\n" : "OK!\n"); + for (int i=0; ispec.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); free(output); music->pos = 0; @@ -198,19 +152,20 @@ JA_Music_t *JA_LoadMusic(Uint8 *buffer, Uint32 length) 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); + music->filename = (char*)malloc(strlen(filename)+1); + strcpy(music->filename, filename); free(buffer); @@ -219,8 +174,7 @@ 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(); @@ -230,60 +184,56 @@ void JA_PlayMusic(JA_Music_t *music, const int loop) current_music->times = loop; current_music->stream = SDL_CreateAudioStream(¤t_music->spec, &JA_audioSpec); - if (!current_music->stream) - printf("[ERROR] SDL_CreateAudioStream failed: %s\n", SDL_GetError()); - if (!SDL_PutAudioStreamData(current_music->stream, current_music->buffer, current_music->length)) - printf("[ERROR] SDL_SetAudioStreamGain failed: %s\n", SDL_GetError()); - if (!SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume)) - printf("[ERROR] SDL_SetAudioStreamGain failed: %s\n", SDL_GetError()); - if (!SDL_BindAudioStream(sdlAudioDevice, current_music->stream)) - printf("[ERROR] SDL_BindAudioStream failed: %s\n", SDL_GetError()); + 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"); + //SDL_ResumeAudioStreamDevice(current_music->stream); +} + +char *JA_GetMusicFilename(JA_Music_t *music) +{ + if (!music) music = current_music; + return music->filename; } 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); + //SDL_PauseAudioStreamDevice(current_music->stream); SDL_UnbindAudioStream(current_music->stream); } 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); + //SDL_ResumeAudioStreamDevice(current_music->stream); SDL_BindAudioStream(sdlAudioDevice, current_music->stream); } 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; - // SDL_PauseAudioStreamDevice(current_music->stream); + //SDL_PauseAudioStreamDevice(current_music->stream); SDL_DestroyAudioStream(current_music->stream); current_music->stream = nullptr; + free(current_music->filename); + current_music->filename = nullptr; } void JA_FadeOutMusic(const int milliseconds) { - if (!JA_musicEnabled) - return; - if (current_music == NULL || current_music->state == JA_MUSIC_INVALID) - return; + if (!JA_musicEnabled) return; + if (current_music == NULL || current_music->state == JA_MUSIC_INVALID) return; fading = true; fade_start_time = SDL_GetTicks(); @@ -293,55 +243,51 @@ void JA_FadeOutMusic(const int milliseconds) 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); - if (music->stream) - 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; + 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); + 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; @@ -349,15 +295,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); @@ -365,18 +311,13 @@ 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, const int group) { - 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; @@ -385,19 +326,17 @@ int JA_PlaySound(JA_Sound_t *sound, const int loop) 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_SetAudioStreamGain(channels[channel].stream, JA_soundVolume[group]); SDL_BindAudioStream(sdlAudioDevice, channels[channel].stream); return channel; } -int JA_PlaySoundOnChannel(JA_Sound_t *sound, const int channel, const int loop) +int JA_PlaySoundOnChannel(JA_Sound_t *sound, const int channel, const int loop, const int group) { - if (!JA_soundEnabled) - return -1; + if (!JA_soundEnabled) return -1; - if (channel < 0 || channel >= JA_MAX_SIMULTANEOUS_CHANNELS) - return -1; + if (channel < 0 || channel >= JA_MAX_SIMULTANEOUS_CHANNELS) return -1; JA_StopChannel(channel); channels[channel].sound = sound; @@ -406,7 +345,7 @@ int JA_PlaySoundOnChannel(JA_Sound_t *sound, const int channel, const int loop) 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_SetAudioStreamGain(channels[channel].stream, JA_soundVolume[group]); SDL_BindAudioStream(sdlAudioDevice, channels[channel].stream); return channel; @@ -414,10 +353,8 @@ int JA_PlaySoundOnChannel(JA_Sound_t *sound, const int channel, 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; @@ -425,8 +362,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) { @@ -434,7 +370,7 @@ void JA_PauseChannel(const int channel) if (channels[i].state == JA_CHANNEL_PLAYING) { channels[i].state = JA_CHANNEL_PAUSED; - // SDL_PauseAudioStreamDevice(channels[i].stream); + //SDL_PauseAudioStreamDevice(channels[i].stream); SDL_UnbindAudioStream(channels[i].stream); } } @@ -443,7 +379,7 @@ void JA_PauseChannel(const int channel) if (channels[channel].state == JA_CHANNEL_PLAYING) { channels[channel].state = JA_CHANNEL_PAUSED; - // SDL_PauseAudioStreamDevice(channels[channel].stream); + //SDL_PauseAudioStreamDevice(channels[channel].stream); SDL_UnbindAudioStream(channels[channel].stream); } } @@ -451,8 +387,7 @@ void JA_PauseChannel(const int channel) void JA_ResumeChannel(const int channel) { - if (!JA_soundEnabled) - return; + if (!JA_soundEnabled) return; if (channel == -1) { @@ -460,7 +395,7 @@ void JA_ResumeChannel(const int channel) if (channels[i].state == JA_CHANNEL_PAUSED) { channels[i].state = JA_CHANNEL_PLAYING; - // SDL_ResumeAudioStreamDevice(channels[i].stream); + //SDL_ResumeAudioStreamDevice(channels[i].stream); SDL_BindAudioStream(sdlAudioDevice, channels[i].stream); } } @@ -469,7 +404,7 @@ void JA_ResumeChannel(const int channel) if (channels[channel].state == JA_CHANNEL_PAUSED) { channels[channel].state = JA_CHANNEL_PLAYING; - // SDL_ResumeAudioStreamDevice(channels[channel].stream); + //SDL_ResumeAudioStreamDevice(channels[channel].stream); SDL_BindAudioStream(sdlAudioDevice, channels[channel].stream); } } @@ -477,15 +412,12 @@ 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++) - { - if (channels[i].state != JA_CHANNEL_FREE) - SDL_DestroyAudioStream(channels[i].stream); + for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) { + if (channels[i].state != JA_CHANNEL_FREE) SDL_DestroyAudioStream(channels[i].stream); channels[i].stream = nullptr; channels[i].state = JA_CHANNEL_FREE; channels[i].pos = 0; @@ -494,8 +426,7 @@ void JA_StopChannel(const int channel) } else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS) { - if (channels[channel].state != JA_CHANNEL_FREE) - SDL_DestroyAudioStream(channels[channel].stream); + if (channels[channel].state != JA_CHANNEL_FREE) SDL_DestroyAudioStream(channels[channel].stream); channels[channel].stream = nullptr; channels[channel].state = JA_CHANNEL_FREE; channels[channel].pos = 0; @@ -505,32 +436,33 @@ void JA_StopChannel(const int channel) 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) +float JA_SetSoundVolume(float volume, const int group) { - JA_soundVolume = SDL_clamp(volume, 0.0f, 1.0f); + const float v = SDL_clamp( volume, 0.0f, 1.0f ); + for (int i = 0; i < JA_MAX_GROUPS; ++i) { + if (group==-1 || group==i) JA_soundVolume[i]=v; + } for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) - if ((channels[i].state == JA_CHANNEL_PLAYING) || (channels[i].state == JA_CHANNEL_PAUSED)) - SDL_SetAudioStreamGain(channels[i].stream, JA_soundVolume); + if ( ((channels[i].state == JA_CHANNEL_PLAYING) || (channels[i].state == JA_CHANNEL_PAUSED)) && + ((group==-1) || (channels[i].group==group)) ) + SDL_SetAudioStreamGain(channels[i].stream, JA_soundVolume[i]); - return JA_soundVolume; + return v; } 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/external/jail_audio.h b/source/external/jail_audio.h index ec5936e..035b5cb 100644 --- a/source/external/jail_audio.h +++ b/source/external/jail_audio.h @@ -13,6 +13,7 @@ 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); +char *JA_GetMusicFilename(JA_Music_t *music = nullptr); void JA_PauseMusic(); void JA_ResumeMusic(); void JA_StopMusic(); @@ -27,14 +28,14 @@ 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); +int JA_PlaySound(JA_Sound_t *sound, const int loop = 0, const int group=0); +int JA_PlaySoundOnChannel(JA_Sound_t *sound, const int channel, const int loop = 0, const int group=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); -float JA_SetSoundVolume(float volume); +float JA_SetSoundVolume(float volume, const int group=0); void JA_EnableSound(const bool value); float JA_SetVolume(float volume); diff --git a/source/notifier.cpp b/source/notifier.cpp index 932d7c7..26ad4fa 100644 --- a/source/notifier.cpp +++ b/source/notifier.cpp @@ -67,7 +67,7 @@ void Notifier::update() if (notifications_[i].state == NotificationStatus::RISING) { // Reproduce el sonido de la notificación - Audio::get()->playSound("notify.wav"); + Audio::get()->playSound("notify.wav", Audio::Group::INTERFACE); } } } diff --git a/source/sections/game.cpp b/source/sections/game.cpp index ec8021d..1a0e7e4 100644 --- a/source/sections/game.cpp +++ b/source/sections/game.cpp @@ -321,7 +321,7 @@ void Game::updateGameStateGameOver() if (Options::audio.enabled) { const float VOL = static_cast(64 * (100 - fade_out_->getValue())) / 100.0f; - Audio::get()->setSoundVolume(static_cast(VOL)); + Audio::get()->setSoundVolume(static_cast(VOL), Audio::Group::GAME); } } @@ -341,7 +341,7 @@ void Game::updateGameStateGameOver() if (Options::audio.enabled) { Audio::get()->stopAllSounds(); - Audio::get()->setSoundVolume(Options::audio.sound.volume); + Audio::get()->setSoundVolume(Options::audio.sound.volume, Audio::Group::GAME); } } } diff --git a/source/ui/service_menu.cpp b/source/ui/service_menu.cpp index b0aca5a..0dabad8 100644 --- a/source/ui/service_menu.cpp +++ b/source/ui/service_menu.cpp @@ -305,10 +305,10 @@ void ServiceMenu::AdjustListValues() } // Reproduce el sonido de navegación del menú -void ServiceMenu::playAdjustSound() { Audio::get()->playSound("service_menu_adjust.wav"); } -void ServiceMenu::playMoveSound() { Audio::get()->playSound("service_menu_move.wav"); } -void ServiceMenu::playSelectSound() { Audio::get()->playSound("service_menu_select.wav"); } -void ServiceMenu::playBackSound() { Audio::get()->playSound("service_menu_select.wav"); } +void ServiceMenu::playAdjustSound() { Audio::get()->playSound("service_menu_adjust.wav", Audio::Group::INTERFACE); } +void ServiceMenu::playMoveSound() { Audio::get()->playSound("service_menu_move.wav", Audio::Group::INTERFACE); } +void ServiceMenu::playSelectSound() { Audio::get()->playSound("service_menu_select.wav", Audio::Group::INTERFACE); } +void ServiceMenu::playBackSound() { Audio::get()->playSound("service_menu_select.wav", Audio::Group::INTERFACE); } // Devuelve el nombre del grupo como string para el título std::string ServiceMenu::settingsGroupToString(SettingsGroup group) const