Mirror/TinWoo
1
0
Fork 0
mirror of https://github.com/hax4dazy/TinWoo.git synced 2025-02-09 19:25:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

don't play non wav sound effects if music is playing

Browse Source
This commit is contained in:
mrdude2478 2023-10-06 13:23:45 +01:00
parent 695d477578
commit adbf44ee5c
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/ui/mainPage.cpp
View File

@ -150,7 +150,7 @@ namespace inst::ui {
const char* x = loadsound.c_str();
audio = Mix_LoadMUS(x);
if (audio != NULL) {
Mix_PlayMusic(audio, -1); //loop "infinitely"
Mix_PlayMusic(audio, -1); //-1 loop "infinitely"
}
}

32
source/util/util.cpp
View File

@ -306,20 +306,24 @@ namespace inst::util {
playWav(audioPath);
return;
}
//if not wav try to play
SDL_Init(SDL_INIT_AUDIO);
Mix_Init(MIX_INIT_MP3); //enable mp3 support
Mix_Init(MIX_INIT_FLAC); //enable flac support
Mix_Init(MIX_INIT_OGG); //enable ogg support
Mix_Init(MIX_INIT_MID);
Mix_Init(MIX_INIT_OPUS);
Mix_OpenAudio(44100, MIX_DEFAULT_FORMAT, MIX_DEFAULT_CHANNELS, 4096);
const char* x = audioPath.c_str();
music = Mix_LoadMUS(x);
if (music != NULL) {
Mix_PlayMusic(music, 1);
}
else {
//check if music is already playing, if not play something.
if (Mix_PlayingMusic() == 0) {
//if not wav try to play
SDL_Init(SDL_INIT_AUDIO);
Mix_Init(MIX_INIT_MP3); //enable mp3 support
Mix_Init(MIX_INIT_FLAC); //enable flac support
Mix_Init(MIX_INIT_OGG); //enable ogg support
Mix_Init(MIX_INIT_MID);
Mix_Init(MIX_INIT_OPUS);
Mix_OpenAudio(44100, MIX_DEFAULT_FORMAT, MIX_DEFAULT_CHANNELS, 4096);
const char* x = audioPath.c_str();
music = Mix_LoadMUS(x);
if (music != NULL) {
Mix_PlayMusic(music, 1);
return;
}
Mix_HaltChannel(-1);
Mix_FreeMusic(music);
Mix_CloseAudio();