jailers/JailAudioSDL3
5
0
Fork 0
forked from JailDoctor/JailAudio
Code Pull Requests Activity

Channels can be paused, resumed, stopped...

Browse Source
This commit is contained in:
JailDoctor
2021-02-04 17:01:00 +01:00
parent 55c9a0ddba
commit 0b9b2eb511
3 changed files with 109 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
jail_audio.cpp
View File

@@ -2,20 +2,20 @@
#include "stb_vorbis.c" #include "stb_vorbis.c"
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
#define JA_MAX_SIMULTANEOUS_SOUNDS 5 #define JA_MAX_SIMULTANEOUS_CHANNELS 5
struct JA_Sound_t { struct JA_Sound_t {
Uint32 length {0}; Uint32 length {0};
Uint8* buffer {NULL}; Uint8* buffer {NULL};
}; };
struct JA_Sound_Playing_t { enum JA_Channel_state { JA_CHANNEL_FREE, JA_CHANNEL_PLAYING, JA_CHANNEL_PAUSED };
Uint32 length {0};
struct JA_Channel_t {
JA_Sound sound;
int pos {0}; int pos {0};
int times {0}; int times {0};
Uint8 *buffer {NULL}; JA_Channel_state state { JA_CHANNEL_FREE };
JA_Sound_Playing_t* prev {NULL};
JA_Sound_Playing_t* next {NULL};
}; };
enum JA_Music_state { JA_MUSIC_INVALID, JA_MUSIC_PLAYING, JA_MUSIC_PAUSED, JA_MUSIC_STOPPED }; enum JA_Music_state { JA_MUSIC_INVALID, JA_MUSIC_PLAYING, JA_MUSIC_PAUSED, JA_MUSIC_STOPPED };
@@ -23,16 +23,13 @@ enum JA_Music_state { JA_MUSIC_INVALID, JA_MUSIC_PLAYING, JA_MUSIC_PAUSED, JA_MU
struct JA_Music_t { struct JA_Music_t {
int samples {0}; int samples {0};
int pos {0}; int pos {0};
int times {0};
short* output {NULL}; short* output {NULL};
JA_Music_state state {JA_MUSIC_INVALID}; JA_Music_state state {JA_MUSIC_INVALID};
int times {0};
}; };
JA_Music current_music{NULL}; JA_Music current_music{NULL};
JA_Sound_Playing_t sounds[JA_MAX_SIMULTANEOUS_SOUNDS]; JA_Channel_t channels[JA_MAX_SIMULTANEOUS_CHANNELS];
JA_Sound_Playing_t *first_sound {NULL};
JA_Sound_Playing_t *last_sound {NULL};
JA_Sound_Playing_t *free_sounds_list {NULL};
int JA_freq {48000}; int JA_freq {48000};
SDL_AudioFormat JA_format {AUDIO_S16}; SDL_AudioFormat JA_format {AUDIO_S16};
@@ -55,36 +52,21 @@ void audioCallback(void * userdata, uint8_t * stream, int len) {
} }
} }
} }
// Mixar els sounds mi amol // Mixar els channels mi amol
JA_Sound_Playing_t *sound = first_sound; for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) {
while (sound != NULL) { if (channels[i].state == JA_CHANNEL_PLAYING) {
const int size = SDL_min(len, sound->length-sound->pos); const int size = SDL_min(len, channels[i].sound->length - channels[i].pos);
SDL_MixAudioFormat(stream, sound->buffer+sound->pos, AUDIO_S16, size, 64); SDL_MixAudioFormat(stream, channels[i].sound->buffer + channels[i].pos, AUDIO_S16, size, 64);
sound->pos += size; channels[i].pos += size;
if (size < len) { if (size < len) {
if (sound->times != 0) { if (channels[i].times != 0) {
SDL_MixAudioFormat(stream+size, sound->buffer, AUDIO_S16, len-size, 64); SDL_MixAudioFormat(stream + size, channels[i].sound->buffer, AUDIO_S16, len-size, 64);
sound->pos = len-size; channels[i].pos = len-size;
if (sound->times > 0) sound->times--; if (channels[i].times > 0) channels[i].times--;
} else { } else {
if (sound == last_sound) last_sound = sound->prev; JA_StopChannel(i);
if (sound == first_sound) first_sound = sound->next;
if (sound->prev != NULL) sound->prev->next = sound->next;
if (sound->next != NULL) sound->next->prev = sound->prev;
if (free_sounds_list == NULL) {
free_sounds_list = sound;
sound = sound->next;
free_sounds_list->prev = free_sounds_list->next = NULL;
} else {
free_sounds_list->prev = sound;
sound = sound->next;
free_sounds_list->prev->next = free_sounds_list;
free_sounds_list = free_sounds_list->prev;
free_sounds_list->prev = NULL;
} }
} }
} else {
sound = sound->next;
} }
} }
} }
@@ -95,10 +77,6 @@ void JA_Init(const int freq, const SDL_AudioFormat format, const int channels) {
JA_channels = channels; JA_channels = channels;
SDL_AudioSpec audioSpec{JA_freq, JA_format, JA_channels, 0, 1024, 0, 0, audioCallback, NULL}; SDL_AudioSpec audioSpec{JA_freq, JA_format, JA_channels, 0, 1024, 0, 0, audioCallback, NULL};
SDL_AudioDeviceID sdlAudioDevice = SDL_OpenAudioDevice(NULL, 0, &audioSpec, NULL, 0); SDL_AudioDeviceID sdlAudioDevice = SDL_OpenAudioDevice(NULL, 0, &audioSpec, NULL, 0);
free_sounds_list = &sounds[0];
for (int i = 0; i < JA_MAX_SIMULTANEOUS_SOUNDS-2;i++) {
sounds[i].next = &sounds[i+1]; sounds[i+1].prev = &sounds[i];
}
SDL_PauseAudioDevice(sdlAudioDevice, 0); SDL_PauseAudioDevice(sdlAudioDevice, 0);
} }
@@ -178,29 +156,62 @@ JA_Sound JA_LoadSound(const char* filename) {
return sound; return sound;
} }
void JA_PlaySound(JA_Sound sound, const int loop) { int JA_PlaySound(JA_Sound sound, const int loop) {
if (free_sounds_list == NULL) { int channel = 0;
first_sound->prev = last_sound; while (channel < JA_MAX_SIMULTANEOUS_CHANNELS && channels[channel].state != JA_CHANNEL_FREE) { channel++; }
last_sound->next = first_sound; if (channel == JA_MAX_SIMULTANEOUS_CHANNELS) channel = 0;
last_sound = first_sound;
first_sound = last_sound->next; channels[channel].sound = sound;
first_sound->prev = last_sound->next = NULL; channels[channel].times = loop;
} else { channels[channel].pos = 0;
if (last_sound != NULL) channels[channel].state = JA_CHANNEL_PLAYING;
last_sound->next = free_sounds_list; return channel;
last_sound = free_sounds_list;
if (free_sounds_list->next != NULL) free_sounds_list->next->prev = NULL;
free_sounds_list = last_sound->next;
last_sound->next = NULL;
if (first_sound == NULL) first_sound = last_sound;
}
last_sound->buffer = sound->buffer;
last_sound->length = sound->length;
last_sound->times = loop;
last_sound->pos = 0;
} }
void JA_DeleteSound(JA_Sound sound) { void JA_DeleteSound(JA_Sound sound) {
for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) {
if (channels[i].sound == sound) JA_StopChannel(i);
}
SDL_FreeWAV(sound->buffer); SDL_FreeWAV(sound->buffer);
delete sound; delete sound;
} }
void JA_PauseChannel(const int channel) {
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;
}
} else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS) {
if (channels[channel].state == JA_CHANNEL_PLAYING) channels[channel].state = JA_CHANNEL_PAUSED;
}
}
void JA_ResumeChannel(const int channel) {
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;
}
} else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS) {
if (channels[channel].state == JA_CHANNEL_PAUSED) channels[channel].state = JA_CHANNEL_PLAYING;
}
}
void JA_StopChannel(const int channel) {
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;
}
} else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS) {
channels[channel].state = JA_CHANNEL_FREE;
channels[channel].pos = 0;
channels[channel].sound = NULL;
}
}
bool JA_IsChannelPlaying(const int channel) {
if (channel < 0 || channel >= JA_MAX_SIMULTANEOUS_CHANNELS) return false;
return channels[channel].state == JA_CHANNEL_PLAYING;
}

6
jail_audio.h
View File

@@ -15,5 +15,9 @@ bool JA_IsMusicPlaying();
void JA_DeleteMusic(JA_Music music); void JA_DeleteMusic(JA_Music music);
JA_Sound JA_LoadSound(const char* filename); JA_Sound JA_LoadSound(const char* filename);
void JA_PlaySound(JA_Sound sound, const int loop = 0); int JA_PlaySound(JA_Sound sound, const int loop = 0);
void JA_PauseChannel(const int channel);
void JA_ResumeChannel(const int channel);
void JA_StopChannel(const int channel);
bool JA_IsChannelPlaying(const int channel);
void JA_DeleteSound(JA_Sound sound); void JA_DeleteSound(JA_Sound sound);

24
main.cpp
View File

@@ -13,6 +13,7 @@ int main(int argc, char **argv) {
JA_Music music = JA_LoadMusic("intro2.ogg"); JA_Music music = JA_LoadMusic("intro2.ogg");
JA_Sound peiv = JA_LoadSound("menu_select.wav"); JA_Sound peiv = JA_LoadSound("menu_select.wav");
int channel = -1;
JA_PlayMusic(music, true); JA_PlayMusic(music, true);
@@ -21,12 +22,25 @@ int main(int argc, char **argv) {
while(SDL_PollEvent(&event)) { while(SDL_PollEvent(&event)) {
if (event.type == SDL_QUIT) { should_exit = true; break; } if (event.type == SDL_QUIT) { should_exit = true; break; }
if (event.type == SDL_KEYDOWN) { if (event.type == SDL_KEYDOWN) {
switch (event.key.keysym.scancode) {
case SDL_SCANCODE_1: // Si pulsem la tecla '1' pausem o despausem la música
if (JA_IsMusicPlaying()) { JA_PauseMusic(); } else { JA_ResumeMusic(); }
break;
case SDL_SCANCODE_2: // Si pulsem la tecla '2' sona el wav 1 vegada
JA_PlaySound(peiv);
break;
case SDL_SCANCODE_3: // Si pulsem la tecla '3' sona el wav 3 vegades
JA_PlaySound(peiv, 2); JA_PlaySound(peiv, 2);
if (JA_IsMusicPlaying()) break;
JA_PauseMusic(); case SDL_SCANCODE_4: // Si pulsem la tecla '4' sona el wav infinitament
else channel = JA_PlaySound(peiv, -1);
{ break;
JA_ResumeMusic(); case SDL_SCANCODE_5: // Si pulsem la tecla '5' pausem o despausem el wav que sonaba infinitament
if (JA_IsChannelPlaying(channel)) { JA_PauseChannel(channel); } else { JA_ResumeChannel(channel); }
break;
case SDL_SCANCODE_6: // Si pulsem la tecla '6' stopem definitivament el wav infinit
JA_StopChannel(channel);
break;
} }
} }