diff options
| author | stonedDiscord <stoned@derpymail.org> | 2020-02-15 21:33:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-15 21:33:32 +0100 |
| commit | d11f6d4506dc00038963624cd3682fc4058e07db (patch) | |
| tree | 671c4607683f3b3277f91543bc1d5e7f4e4f989a | |
| parent | aa15aae55a85648a7248032e932778f14feb0d12 (diff) | |
| parent | 131bc522be92901321e89896a00d548f4b55ac4f (diff) | |
Merge pull request #46 from AttorneyOnline/oldaudio
Oldaudio
| -rw-r--r-- | webAO/client.html | 21 | ||||
| -rw-r--r-- | webAO/client.js | 11 | ||||
| -rw-r--r-- | webAO/styles/client.css | 8 |
3 files changed, 13 insertions, 27 deletions
diff --git a/webAO/client.html b/webAO/client.html index 1f17a65..2152ddc 100644 --- a/webAO/client.html +++ b/webAO/client.html @@ -18,7 +18,6 @@ </head> <body> - <span id="sound"></span> <div id="client_loading"> <h1 id="client_loadingtext">Loading</h1> <button class="client_reconnect" onclick="ReconnectButton()">Reconnect</button> @@ -281,18 +280,17 @@ </span> <br> <br> - <div class="slider">Music - <input id="client_mvolume" class="long" type="range" min="0" max="100" value="80" - onchange="changeMusicVolume()"> - </div> - <div class="slider">SFX - <input id="client_svolume" class="long" type="range" min="0" max="100" value="70" + <p>Music</p> + <audio id="client_musicaudio" onvolumechange="changeMusicVolume()" controls loop></audio> + + <p>SFX</p> + <input id="client_svolume" class="long" type="range" min="0" max="100" value="70" onchange="changeSFXVolume()"> - </div> - <div class="slider">Blip - <input id="client_bvolume" class="long" type="range" min="0" max="100" value="60" + + <p>Blip</p> + <input id="client_bvolume" class="long" type="range" min="0" max="100" value="60" onchange="changeBlipVolume()"> - </div> + <br> <br> <button id="char_change" alt="Change" class="client_button hover_button" onclick="changeCharacter()">Change Character</button> @@ -377,6 +375,7 @@ <template id="music"> <meta name="frame-title" lang="en" content="Music"> + <input id="client_musicsearch" style="display:none"></input> <select id="client_musiclist" size="5" onchange="musiclist_click(event)"> </select> </template> diff --git a/webAO/client.js b/webAO/client.js index 3353cc1..dda1c63 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -371,7 +371,7 @@ class Client extends EventEmitter { document.querySelector('#client_themeselect [value="' + cookietheme + '"]').selected = true; reloadTheme(); - document.getElementById("client_mvolume").value = getCookie("musicVolume"); + document.getElementById("client_musicaudio").volume = getCookie("musicVolume"); changeMusicVolume(); document.getElementById("client_svolume").value = getCookie("sfxVolume"); changeSFXVolume(); @@ -588,7 +588,6 @@ class Client extends EventEmitter { */ handleRMC(args) { viewport.music.pause(); - viewport.music = new Audio(this.musicList[args[1]]); const music = viewport.music; // Music offset + drift from song loading music.totime = args[1]; @@ -1178,9 +1177,6 @@ class Viewport { "cyan" ]; - this.blip = new Audio(AO_HOST + "sounds/general/sfx-blipmale.wav"); - this.blip.volume = 0.5; - // Allocate multiple blip audio channels to make blips less jittery this.blipChannels = new Array(6); @@ -1193,7 +1189,7 @@ class Viewport { this.shoutaudio = new Audio(); - this.music = new Audio(); + this.music = document.getElementById("client_musicaudio"); this.music.play(); this.updater = null; @@ -1847,8 +1843,7 @@ window.area_click = area_click; * Triggered by the music volume slider. */ export function changeMusicVolume() { - viewport.music.volume = document.getElementById("client_mvolume").value / 100; - setCookie("musicVolume", document.getElementById("client_mvolume").value); + setCookie("musicVolume", document.getElementById("client_musicaudio").volume); } window.changeMusicVolume = changeMusicVolume; diff --git a/webAO/styles/client.css b/webAO/styles/client.css index 9ecd8cb..58d9087 100644 --- a/webAO/styles/client.css +++ b/webAO/styles/client.css @@ -358,14 +358,6 @@ border-width: 3px; } -.slider { - padding-right: 4px; - width: 80%; - align-self: center; - margin-left: auto; - margin-right: auto; -} - #client_defense_hp { text-align: left; } |