From d7d813718c1f3ef1458effa0c232085307305f98 Mon Sep 17 00:00:00 2001 From: Raimon Zamora Date: Wed, 6 Nov 2024 20:23:35 +0100 Subject: [PATCH] - Pas complet a SDL3 --- jail_audio.cpp | 284 +++++++++++++++++++++++++--------------- jail_audio.h | 8 +- jail_audio_sdlmixer.cpp | 166 ----------------------- 3 files changed, 183 insertions(+), 275 deletions(-) delete mode 100644 jail_audio_sdlmixer.cpp diff --git a/jail_audio.cpp b/jail_audio.cpp index e58f22e..0944eca 100644 --- a/jail_audio.cpp +++ b/jail_audio.cpp @@ -1,43 +1,51 @@ #ifndef JA_USESDLMIXER #include "jail_audio.h" #include "stb_vorbis.c" -#include +#include #include #define JA_MAX_SIMULTANEOUS_CHANNELS 5 -struct JA_Sound_t { - Uint32 length {0}; - Uint8* buffer {NULL}; +struct JA_Sound_t +{ + SDL_AudioSpec spec { SDL_AUDIO_S16, 2, 48000 }; + Uint32 length { 0 }; + Uint8 *buffer { NULL }; }; -struct JA_Channel_t { - JA_Sound_t *sound; - int pos {0}; - int times {0}; - JA_Channel_state state { JA_CHANNEL_FREE }; +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 }; }; -struct JA_Music_t { - int samples {0}; - int pos {0}; - int times {0}; - short* output {NULL}; - JA_Music_state state {JA_MUSIC_INVALID}; +struct JA_Music_t +{ + 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 }; }; -JA_Music_t *current_music{NULL}; -JA_Channel_t channels[JA_MAX_SIMULTANEOUS_CHANNELS]; +JA_Music_t *current_music { nullptr }; +JA_Channel_t channels[JA_MAX_SIMULTANEOUS_CHANNELS]; -int JA_freq {48000}; -SDL_AudioFormat JA_format {AUDIO_S16}; -Uint8 JA_channels {2}; -int JA_musicVolume = 128; -int JA_soundVolume = 64; -bool JA_musicEnabled = true; -bool JA_soundEnabled = true; -SDL_AudioDeviceID sdlAudioDevice = 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 }; +/* void audioCallback(void * userdata, uint8_t * stream, int len) { SDL_memset(stream, 0, len); if (current_music != NULL && current_music->state == JA_MUSIC_PLAYING) { @@ -73,42 +81,77 @@ void audioCallback(void * userdata, uint8_t * stream, int len) { } } } +*/ -void JA_Init(const int freq, const SDL_AudioFormat format, const int channels) { - 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); +Uint32 JA_UpdateCallback(void *userdata, SDL_TimerID timerID, Uint32 interval) +{ + if (JA_musicEnabled && current_music && current_music->state == JA_MUSIC_PLAYING) + { + if (current_music->times != 0) + { + 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--; + } + else + { + if (SDL_GetAudioStreamAvailable(current_music->stream) == 0) JA_StopMusic(); + } + } + + if (JA_soundEnabled) + { + 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) < (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--; + } + } + else + { + if (SDL_GetAudioStreamAvailable(channels[i].stream) == 0) JA_StopChannel(i); + } + + } + + return 30; } -void JA_Quit() { - SDL_PauseAudioDevice(sdlAudioDevice, 1); - if (sdlAudioDevice != 0) SDL_CloseAudioDevice(sdlAudioDevice); +void JA_Init(const int freq, const SDL_AudioFormat format, const int channels) +{ + JA_audioSpec = {format, channels, freq }; + if (!sdlAudioDevice) SDL_CloseAudioDevice(sdlAudioDevice); + sdlAudioDevice = SDL_OpenAudioDevice(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &JA_audioSpec); + SDL_PauseAudioDevice(sdlAudioDevice); + JA_timerID = SDL_AddTimer(30, JA_UpdateCallback, nullptr); +} + +void JA_Quit() +{ + if (JA_timerID) SDL_RemoveTimer(JA_timerID); + + if (!sdlAudioDevice) SDL_CloseAudioDevice(sdlAudioDevice); sdlAudioDevice = 0; } 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); + int chan, samplerate; + short *output; + music->length = stb_vorbis_decode_memory(buffer, length, &chan, &samplerate, &output) * chan * 2; - 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->spec.channels = chan; + music->spec.freq = samplerate; + music->spec.format = SDL_AUDIO_S16; + music->buffer = (Uint8*)SDL_malloc(music->length); + SDL_memcpy(music->buffer, output, music->length); + SDL_free(output); music->pos = 0; music->state = JA_MUSIC_STOPPED; @@ -145,55 +188,69 @@ void JA_PlayMusic(JA_Music_t *music, const int loop) 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"); + SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume); + if (!SDL_BindAudioStream(sdlAudioDevice, current_music->stream)) printf("[ERROR] SDL_BindAudioStream failed!\n"); } void JA_PauseMusic() { if (!JA_musicEnabled) return; + if (!current_music || current_music->state == JA_MUSIC_INVALID) return; - if (current_music == NULL || current_music->state == JA_MUSIC_INVALID) return; current_music->state = JA_MUSIC_PAUSED; + SDL_PauseAudioStreamDevice(current_music->stream); } void JA_ResumeMusic() { if (!JA_musicEnabled) return; + if (!current_music || current_music->state == JA_MUSIC_INVALID) return; - if (current_music == NULL || current_music->state == JA_MUSIC_INVALID) return; current_music->state = JA_MUSIC_PLAYING; + SDL_ResumeAudioStreamDevice(current_music->stream); } void JA_StopMusic() { if (!JA_musicEnabled) return; + if (!current_music || current_music->state == JA_MUSIC_INVALID) return; - if (current_music == NULL || current_music->state == JA_MUSIC_INVALID) return; current_music->pos = 0; current_music->state = JA_MUSIC_STOPPED; + SDL_PauseAudioStreamDevice(current_music->stream); + SDL_DestroyAudioStream(current_music->stream); + current_music->stream = nullptr; } -JA_Music_state JA_GetMusicState() { +JA_Music_state JA_GetMusicState() +{ if (!JA_musicEnabled) return JA_MUSIC_DISABLED; + if (!current_music) return JA_MUSIC_INVALID; - if (current_music == NULL) return JA_MUSIC_INVALID; return current_music->state; } -void JA_DeleteMusic(JA_Music_t *music) { - if (current_music == music) current_music = NULL; - free(music->output); +void JA_DeleteMusic(JA_Music_t *music) +{ + if (current_music == music) current_music = nullptr; + SDL_free(music->buffer); + SDL_DestroyAudioStream(music->stream); delete music; } -int JA_SetMusicVolume(int volume) +float JA_SetMusicVolume(float volume) { - JA_musicVolume = volume > 128 ? 128 : volume < 0 ? 0 : volume; + JA_musicVolume = SDL_clamp( volume, 0.0f, 1.0f ); + if (current_music) SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume); return JA_musicVolume; } void JA_EnableMusic(const bool value) { - if (!value && current_music != NULL && current_music->state==JA_MUSIC_PLAYING) JA_StopMusic(); + if ( !value && current_music && (current_music->state==JA_MUSIC_PLAYING) ) JA_StopMusic(); JA_musicEnabled = value; } @@ -202,45 +259,26 @@ void JA_EnableMusic(const bool 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; sound->length = 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_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; + 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_AudioSpec wavSpec; - SDL_LoadWAV(filename, &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; + SDL_LoadWAV(filename, &sound->spec, &sound->buffer, &sound->length); return sound; } @@ -257,6 +295,11 @@ int JA_PlaySound(JA_Sound_t *sound, const int loop) 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; } @@ -273,12 +316,22 @@ 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; + 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; + SDL_PauseAudioStreamDevice(channels[i].stream); + } + } + else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS) + { + if (channels[channel].state == JA_CHANNEL_PLAYING) + { + channels[channel].state = JA_CHANNEL_PAUSED; + SDL_PauseAudioStreamDevice(channels[channel].stream); } - } else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS) { - if (channels[channel].state == JA_CHANNEL_PLAYING) channels[channel].state = JA_CHANNEL_PAUSED; } } @@ -286,12 +339,22 @@ 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; + 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; + SDL_ResumeAudioStreamDevice(channels[i].stream); + } + } + else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS) + { + if (channels[channel].state == JA_CHANNEL_PAUSED) + { + channels[channel].state = JA_CHANNEL_PLAYING; + SDL_ResumeAudioStreamDevice(channels[channel].stream); } - } else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS) { - if (channels[channel].state == JA_CHANNEL_PAUSED) channels[channel].state = JA_CHANNEL_PLAYING; } } @@ -299,16 +362,21 @@ void JA_StopChannel(const int channel) { if (!JA_soundEnabled) return; - if (channel == -1) { + if (channel == -1) + { for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) { 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) { + } + else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS) + { channels[channel].state = JA_CHANNEL_FREE; channels[channel].pos = 0; channels[channel].sound = NULL; + SDL_DestroyAudioStream(channels[channel].stream); } } @@ -317,12 +385,18 @@ 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_SetSoundVolume(int volume) +float JA_SetSoundVolume(float volume) { - JA_soundVolume = volume > 128 ? 128 : volume < 0 ? 0 : volume; + 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) ) + SDL_SetAudioStreamGain(channels[i].stream, JA_soundVolume); + return JA_soundVolume; } @@ -335,10 +409,10 @@ void JA_EnableSound(const bool value) JA_soundEnabled = value; } -int JA_SetVolume(int volume) +float JA_SetVolume(float volume) { - JA_musicVolume = volume > 128 ? 128 : volume < 0 ? 0 : volume; - JA_soundVolume = JA_musicVolume/2; + JA_SetSoundVolume(JA_SetMusicVolume(volume) / 2.0f); + return JA_musicVolume; } diff --git a/jail_audio.h b/jail_audio.h index eac8a82..f4cde72 100644 --- a/jail_audio.h +++ b/jail_audio.h @@ -1,5 +1,5 @@ #pragma once -#include +#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 }; @@ -18,7 +18,7 @@ void JA_ResumeMusic(); void JA_StopMusic(); JA_Music_state JA_GetMusicState(); void JA_DeleteMusic(JA_Music_t *music); -int JA_SetMusicVolume(int volume); +float JA_SetMusicVolume(float volume); void JA_EnableMusic(const bool value); JA_Sound_t *JA_NewSound(Uint8* buffer, Uint32 length); @@ -30,7 +30,7 @@ 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); +float JA_SetSoundVolume(float volume); void JA_EnableSound(const bool value); -int JA_SetVolume(int volume); +float JA_SetVolume(float volume); diff --git a/jail_audio_sdlmixer.cpp b/jail_audio_sdlmixer.cpp deleted file mode 100644 index 8ee32a7..0000000 --- a/jail_audio_sdlmixer.cpp +++ /dev/null @@ -1,166 +0,0 @@ -#ifdef JA_USESDLMIXER -#include "jail_audio.h" -#include -#include -#include - -struct JA_Sound_t {}; // Dummy structs -struct JA_Music_t {}; - -int JA_freq {48000}; -SDL_AudioFormat JA_format {AUDIO_S16}; -Uint8 JA_channels {2}; -int JA_musicVolume = 128; -int JA_soundVolume = 64; -bool JA_musicEnabled = true; -bool JA_soundEnabled = true; - -void JA_Init(const int freq, const SDL_AudioFormat format, const int channels) { - JA_freq = freq; - JA_format = format; - JA_channels = channels; - Mix_OpenAudio(JA_freq, JA_format, JA_channels, 1024); -} - -void JA_Quit() { - Mix_CloseAudio(); -} - -JA_Music_t *JA_LoadMusic(const char* filename) { - return (JA_Music_t*)Mix_LoadMUS(filename); -} - -void JA_PlayMusic(JA_Music_t *music, const int loop) -{ - if (!JA_musicEnabled) return; - Mix_PlayMusic((Mix_Music*)music, loop); - Mix_VolumeMusic(JA_musicVolume); -} - -void JA_PauseMusic() -{ - if (!JA_musicEnabled) return; - Mix_PauseMusic(); -} - -void JA_ResumeMusic() -{ - if (!JA_musicEnabled) return; - Mix_ResumeMusic(); -} - -void JA_StopMusic() -{ - if (!JA_musicEnabled) return; - Mix_HaltMusic(); -} - -JA_Music_state JA_GetMusicState() -{ - if (!JA_musicEnabled) return JA_MUSIC_DISABLED; - - if (Mix_PausedMusic()) { - return JA_MUSIC_PAUSED; - } else if (Mix_PlayingMusic()) { - return JA_MUSIC_PLAYING; - } else { - return JA_MUSIC_STOPPED; - } -} - -void JA_DeleteMusic(JA_Music_t *music) -{ - Mix_FreeMusic((Mix_Music*)music); -} - -int JA_SetMusicVolume(int volume) -{ - JA_musicVolume = volume; - Mix_VolumeMusic(JA_musicVolume); - return JA_musicVolume; -} - -void JA_EnableMusic(const bool value) -{ - if (Mix_PlayingMusic()) Mix_HaltMusic(); - JA_musicEnabled = value; -} - - - - - -JA_Sound_t *JA_NewSound(Uint8* buffer, Uint32 length) -{ - return NULL; -} - -JA_Sound_t *JA_LoadSound(const char* filename) { - JA_Sound_t *sound = (JA_Sound_t*)Mix_LoadWAV(filename); - return sound; -} - -int JA_PlaySound(JA_Sound_t *sound, const int loop) { - if (!JA_soundEnabled) return -1; - const int channel = Mix_PlayChannel(-1, (Mix_Chunk*)sound, loop); - Mix_Volume(-1, JA_soundVolume); - return channel; -} - -void JA_DeleteSound(JA_Sound_t *sound) -{ - Mix_FreeChunk((Mix_Chunk*)sound); -} - -void JA_PauseChannel(const int channel) -{ - if (!JA_soundEnabled) return; - Mix_Pause(channel); -} - -void JA_ResumeChannel(const int channel) -{ - if (!JA_soundEnabled) return; - Mix_Resume(channel); -} - -void JA_StopChannel(const int channel) -{ - if (!JA_soundEnabled) return; - Mix_HaltChannel(channel); -} - -JA_Channel_state JA_GetChannelState(const int channel) -{ - if (!JA_soundEnabled) return JA_SOUND_DISABLED; - - if (Mix_Paused(channel)) { - return JA_CHANNEL_PAUSED; - } else if (Mix_Playing(channel)) { - return JA_CHANNEL_PLAYING; - } else { - return JA_CHANNEL_FREE; - } -} - -int JA_SetSoundVolume(int volume) -{ - JA_musicVolume = volume; - Mix_Volume(-1, JA_musicVolume); - return JA_musicVolume; -} - -void JA_EnableSound(const bool value) -{ - Mix_HaltChannel(-1); - JA_soundEnabled = value; -} - - -int JA_SetVolume(int volume) -{ - JA_SetSoundVolume(volume); - return JA_SetMusicVolume(volume); -} - -#endif