cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Makes lobby music use youtube-dl and goonchat""

Browse Source
This commit is contained in:
nichlas0010
2018-10-31 23:51:33 +01:00
committed by GitHub
parent a7932a6887
commit 692f12d29b
10 changed files with 88 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/goonchat/browserassets/js/browserOutput.js
View File

@@ -507,6 +507,8 @@ function ehjaxCallback(data) {
internalOutput('<div class="connectionClosed internal restarting">The connection has been closed because the server is restarting. Please wait while you automatically reconnect.</div>', 'internal');
} else if (data == 'stopMusic') {
$('#adminMusic').prop('src', '');
} else if (data == 'stopLobbyMusic') { //yogs start - lobby music
$('#lobbyMusic').prop('src', ''); //yogs end
} else {
//Oh we're actually being sent data instead of an instruction
var dataJ;
@@ -555,7 +557,15 @@ function ehjaxCallback(data) {
$('#adminMusic').prop('src', adminMusic);
$('#adminMusic').trigger("play");
}
}
} else if (data.lobbyMusic) { //yogs start - lobby music
if (typeof data.lobbyMusic === 'string') {
var lobbyMusic = byondDecode(data.lobbyMusic);
lobbyMusic = lobbyMusic.match(/https?:\/\/\S+/) || '';
$('#lobbyMusic').prop('defaultPlaybackRate', 1.0);
$('#lobbyMusic').prop('src', lobbyMusic);
$('#lobbyMusic').trigger("play");
}
} //yogs end
}
}
@@ -716,6 +726,7 @@ $(function() {
if (savedConfig.smusicVolume) {
var newVolume = clamp(savedConfig.smusicVolume, 0, 100);
$('#adminMusic').prop('volume', newVolume / 100);
$('#lobbyMusic').prop('volume', newVolume / 100); //yogs
$('#musicVolume').val(newVolume);
opts.updatedVolume = newVolume;
sendVolumeUpdate();
@@ -723,6 +734,7 @@ $(function() {
}
else{
$('#adminMusic').prop('volume', opts.defaultMusicVolume / 100);
$('#lobbyMusic').prop('volume', opts.defaultMusicVolume / 100); //yogs
}
if (savedConfig.smessagecombining) {
@@ -1063,6 +1075,7 @@ $(function() {
var newVolume = $('#musicVolume').val();
newVolume = clamp(newVolume, 0, 100);
$('#adminMusic').prop('volume', newVolume / 100);
$('#lobbyMusic').prop('volume', newVolume / 100); //yogs
setCookie('musicVolume', newVolume, 365);
opts.updatedVolume = newVolume;
if(!opts.volumeUpdating) {