JailDoctor/JailAudio
2
0
Fork 1
Code Issues 2 Pull Requests Projects Releases 3 Wiki Activity

Compare commits

base: JailDoctor:cb1154cb202cc3881d85e2bc44c0cde9bb9e4430
Branches Tags
JailDoctor:master
JailDoctor:v1.2 JailDoctor:v1.1 JailDoctor:v1.0.0
...
compare: JailDoctor:761119acf23c0d05686a529b6f127041ed7c9c98
Branches Tags
JailDoctor:master
JailDoctor:v1.2 JailDoctor:v1.1 JailDoctor:v1.0.0

2 Commits
cb1154cb20 ... 761119acf2

Author SHA1 Message Date
Raimon Zamora
761119acf2 [FIX] JA_DeleteMusic() crashes, wrong free method 2022-10-07 17:44:23 +02:00
Raimon Zamora
edf7484738 [FIX] SDL_AudioDeviceID is an Uint32, not a pointer 2022-10-07 17:33:43 +02:00
1 changed files with 5 additions and 5 deletions
Expand all files Collapse all files

10
jail_audio.cpp
View File

@@ -32,7 +32,7 @@ int JA_freq {48000};
SDL_AudioFormat JA_format {AUDIO_S16}; SDL_AudioFormat JA_format {AUDIO_S16};
Uint8 JA_channels {2}; Uint8 JA_channels {2};
int JA_volume = 128; int JA_volume = 128;
SDL_AudioDeviceID sdlAudioDevice = NULL; SDL_AudioDeviceID sdlAudioDevice = 0;
void audioCallback(void * userdata, uint8_t * stream, int len) { void audioCallback(void * userdata, uint8_t * stream, int len) {
SDL_memset(stream, 0, len); SDL_memset(stream, 0, len);
@@ -75,15 +75,15 @@ void JA_Init(const int freq, const SDL_AudioFormat format, const int channels) {
JA_format = format; JA_format = format;
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};
if (sdlAudioDevice != NULL) SDL_CloseAudioDevice(sdlAudioDevice); if (sdlAudioDevice != 0) SDL_CloseAudioDevice(sdlAudioDevice);
sdlAudioDevice = SDL_OpenAudioDevice(NULL, 0, &audioSpec, NULL, 0); sdlAudioDevice = SDL_OpenAudioDevice(NULL, 0, &audioSpec, NULL, 0);
SDL_PauseAudioDevice(sdlAudioDevice, 0); SDL_PauseAudioDevice(sdlAudioDevice, 0);
} }
void JA_Quit() { void JA_Quit() {
SDL_PauseAudioDevice(sdlAudioDevice, 1); SDL_PauseAudioDevice(sdlAudioDevice, 1);
if (sdlAudioDevice != NULL) SDL_CloseAudioDevice(sdlAudioDevice); if (sdlAudioDevice != 0) SDL_CloseAudioDevice(sdlAudioDevice);
sdlAudioDevice = NULL; sdlAudioDevice = 0;
} }
JA_Music JA_LoadMusic(const char* filename) { JA_Music JA_LoadMusic(const char* filename) {
@@ -154,7 +154,7 @@ JA_Music_state JA_GetMusicState() {
void JA_DeleteMusic(JA_Music music) { void JA_DeleteMusic(JA_Music music) {
if (current_music == music) current_music = NULL; if (current_music == music) current_music = NULL;
SDL_free(music->output); free(music->output);
delete music; delete music;
} }