fix sound effects pr

ps2homebrew · Dec 15, 2018 · cea2f0c · cea2f0c
1 parent 6301f9e
commit cea2f0c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/include/sound.h b/include/sound.h
@@ -5,7 +5,7 @@
 
 extern struct audsrv_adpcm_t sfx[NUM_SFX_FILES];
 
-int sfxInit(void);
+int sfxInit(int bootSnd);
 void sfxVolume(void);
 
 int thmSfxEnabled;

diff --git a/src/gui.c b/src/gui.c
@@ -556,11 +556,10 @@ void guiShowUIConfig(void)
         diaGetInt(diaUIConfig, UICFG_YOFF, &gYOff);
         diaGetInt(diaUIConfig, UICFG_OVERSCAN, &gOverscan);
 
-		int changed = thmSetGuiValue(themeID, changed);
-        if (changed) {
-            sfxInit();
-        }
         applyConfig(themeID, langID);
+        //wait 70ms for confirm sound to finish playing before clearing buffer
+        guiDelay(0070);
+        sfxInit(0);
     }
 }
 

diff --git a/src/opl.c b/src/opl.c
@@ -1315,7 +1315,7 @@ static void deferredAudioInit(void)
         LOG("Failed to initialize audsrv\n");
         LOG("Audsrv returned error string: %s\n", audsrv_get_error_string());
 
-    ret = sfxInit();
+    ret = sfxInit(1);
     if (ret >= 0)
         LOG("sfxInit: %d samples loaded.\n", ret);
     else

diff --git a/src/sound.c b/src/sound.c
@@ -1,4 +1,4 @@
-/*--    Theme Sound Effects -------------------------------------------------------------------------------------------------
+/*--    Theme Sound Effects    ----------------------------------------------------------------------------------------------
 ----    SP193 wrote the code, I just made small changes.    ---------------------------------------------------------------*/
 
 #include <audsrv.h>
@@ -154,7 +154,7 @@ void sfxVolume(void)
 }
 
 //Returns number of audio files successfully loaded, < 0 if an unrecoverable error occurred.
-int sfxInit(void)
+int sfxInit(int bootSnd)
 {
     char full_path[256];
     int ret, i, loaded;
@@ -163,14 +163,20 @@ int sfxInit(void)
 
     sfxInitDefaults();
     sfxVolume();
-
-    ret = getFadeDelay();
-    if (ret != 0) {
-        gFadeDelay = 1200;
+    //boot sound only needs to be read/loaded at init
+    if (bootSnd) {
+        ret = getFadeDelay();
+        if (ret != 0) {
+            gFadeDelay = 1200;
+        }
+        i = 0;
+    }
+    else {
+        i = 1;
     }
 
     loaded = 0;
-    for (i = 0; i < NUM_SFX_FILES; i++)
+    for (; i < NUM_SFX_FILES; i++)
     {
         if (thmSfxEnabled < 0)
         {