Compare commits
2 Commits
cb1154cb20
...
761119acf2
| Author | SHA1 | Date | |
|---|---|---|---|
| 761119acf2 | |||
| edf7484738 |
@@ -32,7 +32,7 @@ int JA_freq {48000};
|
||||
SDL_AudioFormat JA_format {AUDIO_S16};
|
||||
Uint8 JA_channels {2};
|
||||
int JA_volume = 128;
|
||||
SDL_AudioDeviceID sdlAudioDevice = NULL;
|
||||
SDL_AudioDeviceID sdlAudioDevice = 0;
|
||||
|
||||
void audioCallback(void * userdata, uint8_t * stream, int 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_channels = channels;
|
||||
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);
|
||||
SDL_PauseAudioDevice(sdlAudioDevice, 0);
|
||||
}
|
||||
|
||||
void JA_Quit() {
|
||||
SDL_PauseAudioDevice(sdlAudioDevice, 1);
|
||||
if (sdlAudioDevice != NULL) SDL_CloseAudioDevice(sdlAudioDevice);
|
||||
sdlAudioDevice = NULL;
|
||||
if (sdlAudioDevice != 0) SDL_CloseAudioDevice(sdlAudioDevice);
|
||||
sdlAudioDevice = 0;
|
||||
}
|
||||
|
||||
JA_Music JA_LoadMusic(const char* filename) {
|
||||
@@ -154,7 +154,7 @@ JA_Music_state JA_GetMusicState() {
|
||||
|
||||
void JA_DeleteMusic(JA_Music music) {
|
||||
if (current_music == music) current_music = NULL;
|
||||
SDL_free(music->output);
|
||||
free(music->output);
|
||||
delete music;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user