Merge pull request #119 from caleb-mabry/moving-audio-channels

Moving Audio Channels to HTML Elements

3 files changed, 28 insertions, 6 deletions

diff --git a/webAO/client.js b/webAO/client.js
index bf274db..e9eb13a 100644
--- a/webAO/client.js
+++ b/webAO/client.js
@@ -1689,12 +1689,8 @@ class Viewport {
     this.testimonyAudio = document.getElementById('client_testimonyaudio');
     this.testimonyAudio.src = `${AO_HOST}sounds/general/sfx-guilty.opus`;
 
-    this.music = new Array(
-      new Audio(`${AO_HOST}sounds/music/trial (aa).opus`),
-      new Audio(`${AO_HOST}sounds/music/trial (aa).opus`),
-      new Audio(`${AO_HOST}sounds/music/trial (aa).opus`),
-      new Audio(`${AO_HOST}sounds/music/trial (aa).opus`),
-    );
+    const audioChannels = document.getElementsByClassName('audioChannel')
+    this.music = [...audioChannels];
     this.music.forEach((channel) => channel.volume = 0.5);
     this.music.forEach((channel) => channel.onerror = opusCheck(channel));
 
@@ -2612,6 +2608,10 @@ window.imgError = imgError;
  * @param {HTMLImageElement} image the element containing the missing sound
  */
 export function opusCheck(channel) {
+  const audio = channel.src
+  if (audio === '') {
+    return
+  }
   console.info(`failed to load sound ${channel.src}`);
   let oldsrc = '';
   oldsrc = channel.src;
diff --git a/webAO/components/__tests__/audioChannels.test.js b/webAO/components/__tests__/audioChannels.test.js
new file mode 100644
index 0000000..243d870
--- /dev/null
+++ b/webAO/components/__tests__/audioChannels.test.js
@@ -0,0 +1,9 @@
+import createAudioChannels from "../audioChannels";
+
+describe('createAudioChannels', () => {
+    test('Should create 4 channels', () => {
+        document.body.innerHTML = ''
+        createAudioChannels(4)
+        expect(document.getElementsByClassName('audioChannel').length).toBe(4)
+    })
+})
\ No newline at end of file
diff --git a/webAO/components/audioChannels.js b/webAO/components/audioChannels.js
new file mode 100644
index 0000000..1979653
--- /dev/null
+++ b/webAO/components/audioChannels.js
@@ -0,0 +1,13 @@
+/**
+ * 
+ * @param {number} amountOfChannels Amount of Blips to put on page
+ */
+const createAudioChannels = (amountOfChannels) => {
+    for (let i = 0; i < amountOfChannels; i++) {
+        const audioChannel = document.createElement('audio')
+        audioChannel.setAttribute('class', 'audioChannel')
+        document.body.appendChild(audioChannel)
+    }
+}
+createAudioChannels(4)
+export default createAudioChannels