Client-side Jukebox, Client-side Lobby Music, Synchronised Music & TGUI Panel Music Player Improvements

.gitignore

@@ -178,12 +178,6 @@ Temporary Items
 /_maps/**/backup/
 /_maps/templates.dm
 
-# Ignore custom music (amend as appropriate)
-/config/jukebox_music/sounds/*
-!/config/jukebox_music/sounds/exclude
-/config/title_music/sounds/*
-!/config/title_music/sounds/exclude
-
 # Common build tooling, C B T
 !/tools/build
 

beestation.dme

@@ -460,6 +460,7 @@
 #include "code\controllers\subsystem\minor_mapping.dm"
 #include "code\controllers\subsystem\mobs.dm"
 #include "code\controllers\subsystem\moods.dm"
+#include "code\controllers\subsystem\music.dm"
 #include "code\controllers\subsystem\natural_light_cycle.dm"
 #include "code\controllers\subsystem\nightshift.dm"
 #include "code\controllers\subsystem\npcpool.dm"
@@ -1127,7 +1128,6 @@
 #include "code\game\machinery\cloning.dm"
 #include "code\game\machinery\constructable_frame.dm"
 #include "code\game\machinery\cryopod.dm"
-#include "code\game\machinery\dance_machine.dm"
 #include "code\game\machinery\defibrillator_mount.dm"
 #include "code\game\machinery\digital_clock.dm"
 #include "code\game\machinery\dish_drive.dm"
@@ -3435,6 +3435,18 @@
 #include "code\modules\multiz\zmimic\mimic_common.dm"
 #include "code\modules\multiz\zmimic\mimic_movable.dm"
 #include "code\modules\multiz\zmimic\mimic_turf.dm"
+#include "code\modules\music\jukebox.dm"
+#include "code\modules\music\music_listener.dm"
+#include "code\modules\music\assets\asset_extensions.dm"
+#include "code\modules\music\client\client_extensions.dm"
+#include "code\modules\music\licenses\license.dm"
+#include "code\modules\music\licenses\license_cc0.dm"
+#include "code\modules\music\licenses\license_ccby3.dm"
+#include "code\modules\music\licenses\license_grandfathered.dm"
+#include "code\modules\music\tgui_panel\audio_extensions.dm"
+#include "code\modules\music\tracks\playing_track.dm"
+#include "code\modules\music\tracks\track.dm"
+#include "code\modules\music\tracks\tracks.dm"
 #include "code\modules\ninja\__ninjaDefines.dm"
 #include "code\modules\ninja\energy_katana.dm"
 #include "code\modules\ninja\ninja_event.dm"

code/__DEFINES/sound.dm

@@ -1,8 +1,6 @@
 //max channel is 1024. Only go lower from here, because byond tends to pick the first availiable channel to play sounds on
-#define CHANNEL_LOBBYMUSIC		1024
-#define CHANNEL_ADMIN			1023
+#define CHANNEL_ADMIN			1024
 #define CHANNEL_VOX				1022
-#define CHANNEL_JUKEBOX			1021
 #define CHANNEL_JUSTICAR_ARK	1020
 #define CHANNEL_HEARTBEAT		1019 //sound channel for heartbeats
 #define CHANNEL_AMBIENT_EFFECTS	1018
@@ -118,3 +116,17 @@
 #define SOUNDTRACK_PLAY_RESPECT 0
 #define SOUNDTRACK_PLAY_ALL 1
 #define SOUNDTRACK_PLAY_ONLYSTATION 2
+
+/// Defines for audio track availability
+
+#define TRACK_FLAG_ALL (~0)
+#define TRACK_FLAG_TITLE (1<<0)
+#define TRACK_FLAG_JUKEBOX (1<<1)
+#define TRACK_FLAG_ROUNDEND (1<<2)
+
+/// Defines for playing track flags
+
+#define PLAYING_FLAG_DEFAULT 0
+#define PLAYING_FLAG_TITLE_MUSIC (1 << 0)
+#define PLAYING_FLAG_JUKEBOX (1 << 1)
+#define PLAYING_FLAG_ADMIN (1 << 2)

code/__DEFINES/subsystems.dm

@@ -137,6 +137,7 @@
 #define INIT_ORDER_GREYSCALE 		81
 #define INIT_ORDER_VIS				80
 #define INIT_ORDER_SECURITY_LEVEL 79 // We need to load before events so that it has a security level to choose from.
+#define INIT_ORDER_MUSIC			78 // Performs its loading asynchronously, so will run in the background while other things load.
 #define INIT_ORDER_ACHIEVEMENTS 	77
 #define INIT_ORDER_RESEARCH			75
 #define INIT_ORDER_ORBITS			74 //Other things use the orbital map, so it needs to be made early on.

code/__HELPERS/roundend.dm

@@ -208,11 +208,15 @@
 		cb.InvokeAsync()
 	LAZYCLEARLIST(round_end_events)
 
+	// Play a new song from the beginning
+	SSmusic.play_next_lobby_song()
+
 	for(var/client/C in GLOB.clients)
 		if(C)
 
 			C?.process_endround_metacoin()
-			C?.playtitlemusic(40)
+			if (SSmusic.login_music)
+				C?.tgui_panel?.play_global_music(SSmusic.login_music)
 
 			if(CONFIG_GET(flag/allow_crew_objectives))
 				var/mob/M = C?.mob