Skip to content

Commit bb4a9a6

Browse files
authored
fixes jukeboxes and lobby music not working on 516 i guess (#6194)
## About The Pull Request fixes #6058 this doesn't support jukebox directional audio tho the old Windows Media Player backend is still used on 515 ## Testing Proof ***make sure to turn audio on, embedded videos on github are muted by default*** https://github.com/user-attachments/assets/c792a4a8-8c86-4060-bdac-a12ff400aacc https://github.com/user-attachments/assets/dee6e86a-1efd-47b6-9c7a-6efd7249b6f3 ## Changelog :cl: fix: Jukebox and lobby screen music should now play on BYOND 516. Jukeboxes won't have directional audio, however. /:cl:
1 parent c718431 commit bb4a9a6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

monkestation/code/modules/cassettes/machines/media/HTML5_player.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function SetVolume(volume, balance) {
2626
</script>
2727
</head>
2828
<body>
29-
<audio id="player"></audio>
29+
<audio id="player" crossOrigin="anonymous"></audio>
3030
</body>
3131
</html>
3232
"}

monkestation/code/modules/cassettes/machines/media/media_manager.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122

123123
// Actually pop open the player in the background.
124124
/datum/media_manager/proc/open()
125-
playerstyle = PLAYER_WMP_HTML
125+
playerstyle = owner.byond_version >= 516 ? PLAYER_HTML5_HTML : PLAYER_WMP_HTML // i beg of ye, someone convert the html5 player to use a proper audio library with positional audio support
126126
owner << browse(null, "window=[WINDOW_ID]")
127127
owner << browse(playerstyle, "window=[WINDOW_ID]")
128128
send_update()

0 commit comments

Comments
 (0)