[core] Preload few SFX to avoid first input lag.

Author: DC-SWAT

include/sfx.h

@@ -26,6 +26,6 @@ typedef enum {
 int ds_sfx_play(ds_sfx_t sfx);
 int ds_sfx_is_enabled(ds_sfx_t sfx);
 void ds_sfx_get_wav(char sfx_path[], ds_sfx_t sfx_sel);
-
+void ds_sfx_preload(void);
 
 #endif /* _DS_SFX_H */

src/main.c

@@ -294,25 +294,25 @@ int InitDS() {
 		return -1;
 	}
 
+	/* Preload some sfx to avoid delay on first input */
+	ds_sfx_preload();
+
 #ifdef DS_DEBUG
 	uint64 t_end = timer_ms_gettime64();
 	dbglog(DBG_INFO, "Initializing time: %ld ms\n", (uint32)(t_end - t_start));
 #endif
 
 	if(settings->startup[0] == '/') {
-
 		snprintf(fn, NAME_MAX, "%s%s", getenv("PATH"), settings->startup);
 		LuaDo(LUA_DO_FILE, fn, GetLuaState());
-
-	} else if(settings->startup[0] == '#') {
-
+	}
+	else if(settings->startup[0] == '#') {
 		dsystem_buff(settings->startup);
-
-	} else if(settings->startup[0] != 0) {
-
+	}
+	else if(settings->startup[0] != 0) {
 		LuaDo(LUA_DO_STRING, settings->startup, GetLuaState());
-
-	} else {
+	}
+	else {
 		snprintf(fn, NAME_MAX, "%s/lua/startup.lua", getenv("PATH"));
 		LuaDo(LUA_DO_FILE, fn, GetLuaState());
 	}

src/sfx.c

@@ -168,14 +168,9 @@ int ds_sfx_is_enabled(ds_sfx_t sfx) {
 	}
 }
 
-static int ds_sfx_get_volume() {
-	Settings_t *settings = GetSettings();
-	
-	if(!settings) {
-		return 230;
-	}
-	
-	return settings->audio.volume;
+static int ds_sfx_get_volume(void) {
+	int volume = GetVolumeFromSettings();
+	return volume < 0 ? 230 : volume;
 }
 
 void ds_sfx_get_wav(char sfx_path[], ds_sfx_t sfx_sel) {
@@ -223,6 +218,25 @@ static int ds_sfx_play_stream(ds_sfx_t sfx) {
 	return 0;
 }
 
+void ds_sfx_preload(void) {
+	ds_sfx_t init_sfx[] = {DS_SFX_CLICK, DS_SFX_CLICK2, DS_SFX_SLIDE};
+	int init_count = sizeof(init_sfx) / sizeof(init_sfx[0]);
+
+	for(int i = 0; i < init_count; i++) {
+		if(!ds_sfx_is_enabled(init_sfx[i])) {
+			continue;
+		}
+
+		int sfx_sel = init_sfx[i] - DS_SFX_LAST_STREAM;
+
+		if(sys_sfx_hnd[sfx_sel] == SFXHND_INVALID) {
+			char sfx_path[NAME_MAX];
+			ds_sfx_get_wav(sfx_path, sfx_sel);
+			sys_sfx_hnd[sfx_sel] = snd_sfx_load(sfx_path);
+		}
+	}
+}
+
 int ds_sfx_play(ds_sfx_t sfx) {
 	if(sfx >= DS_SFX_LAST) {
 		return -1;