shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

free speed, fwee! - caches a sound for each playing jukebox to avoid datum creation overhead every fire

Browse Source
This commit is contained in:
deathride58
2022-05-22 00:53:52 -04:00
parent ccc5c6cf75
commit b34cfa6485
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/jukeboxes.dm
+11 -8
View File
@@ -11,6 +11,7 @@
#define JUKE_CHANNEL 2 #define JUKE_CHANNEL 2
#define JUKE_BOX 3 #define JUKE_BOX 3
#define JUKE_FALLOFF 4 #define JUKE_FALLOFF 4
#define JUKE_SOUND 5
SUBSYSTEM_DEF(jukeboxes) SUBSYSTEM_DEF(jukeboxes)
@@ -41,14 +42,15 @@ SUBSYSTEM_DEF(jukeboxes)
if(!channeltoreserve) if(!channeltoreserve)
return FALSE return FALSE
freejukeboxchannels -= channeltoreserve freejukeboxchannels -= channeltoreserve
var/list/youvegotafreejukebox = list(T, channeltoreserve, jukebox, jukefalloff) var/list/youvegotafreejukebox = list(T, channeltoreserve, jukebox, jukefalloff, null)
var/sound/song_to_init = sound(T.song_path)
song_to_init.status = SOUND_MUTE
youvegotafreejukebox[JUKE_SOUND] = song_to_init
activejukeboxes.len++ activejukeboxes.len++
activejukeboxes[activejukeboxes.len] = youvegotafreejukebox activejukeboxes[activejukeboxes.len] = youvegotafreejukebox
//Due to changes in later versions of 512, SOUND_UPDATE no longer properly plays audio when a file is defined in the sound datum. As such, we are now required to init the audio before we can actually do anything with it.
//Downsides to this? This means that you can *only* hear the jukebox audio if you were present on the server when it started playing, and it means that it's now impossible to add loops to the jukebox track list.
var/sound/song_to_init = sound(T.song_path)
song_to_init.status = SOUND_MUTE
for(var/mob/M in GLOB.player_list) for(var/mob/M in GLOB.player_list)
if(!M.client) if(!M.client)
continue continue
@@ -109,18 +111,18 @@ SUBSYSTEM_DEF(jukeboxes)
if(!jukeinfo.len) if(!jukeinfo.len)
stack_trace("Active jukebox without any associated metadata.") stack_trace("Active jukebox without any associated metadata.")
continue continue
var/datum/track/juketrack = jukeinfo[1] var/datum/track/juketrack = jukeinfo[JUKE_TRACK]
if(!istype(juketrack)) if(!istype(juketrack))
stack_trace("Invalid jukebox track datum.") stack_trace("Invalid jukebox track datum.")
continue continue
var/obj/jukebox = jukeinfo[3] var/obj/jukebox = jukeinfo[JUKE_BOX]
if(!istype(jukebox)) if(!istype(jukebox))
stack_trace("Nonexistant or invalid object associated with jukebox.") stack_trace("Nonexistant or invalid object associated with jukebox.")
continue continue
var/list/audible_zlevels = get_multiz_accessible_levels(jukebox.z) //TODO - for multiz refresh, this should use the cached zlevel connections var in SSMapping. For now this is fine! var/list/audible_zlevels = get_multiz_accessible_levels(jukebox.z) //TODO - for multiz refresh, this should use the cached zlevel connections var in SSMapping. For now this is fine!
var/sound/song_played = sound(juketrack.song_path) var/sound/song_played = jukeinfo[JUKE_SOUND]
var/turf/currentturf = get_turf(jukebox) var/turf/currentturf = get_turf(jukebox)
var/area/currentarea = get_area(jukebox) var/area/currentarea = get_area(jukebox)
var/list/hearerscache = hearers(7, jukebox) var/list/hearerscache = hearers(7, jukebox)
@@ -153,3 +155,4 @@ SUBSYSTEM_DEF(jukeboxes)
#undef JUKE_CHANNEL #undef JUKE_CHANNEL
#undef JUKE_BOX #undef JUKE_BOX
#undef JUKE_FALLOFF #undef JUKE_FALLOFF
#undef JUKE_SOUND