🔥 Remove extraAudio feature

GitSquared · Feb 21, 2019 · c3e9490 · c3e9490
1 parent b0bc79d
commit c3e9490
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 36 deletions.
diff --git a/src/_boot.js b/src/_boot.js
@@ -71,7 +71,6 @@ if (!fs.existsSync(settingsFile)) {
         theme: "tron",
         termFontSize: 15,
         audio: true,
-        extraAudio: false,
         pingAddr: "1.1.1.1",
         port: 3000,
         nointro: false,

diff --git a/src/_renderer.js b/src/_renderer.js
@@ -268,7 +268,6 @@ async function displayTitleScreen() {
 
     await _delay(400);
 
-    window.audioManager.intro.play();
     document.body.setAttribute("class", "");
     title.setAttribute("style", `border: 5px solid rgb(${window.theme.r}, ${window.theme.g}, ${window.theme.b});`);
 
@@ -297,7 +296,6 @@ async function initUI() {
 
     await _delay(10);
 
-    window.audioManager.scan.play();
     document.getElementById("main_shell").setAttribute("style", "height:0%;margin-bottom:30vh;");
 
     await _delay(500);
@@ -601,14 +599,6 @@ window.openSettings = async () => {
                             <option>${!window.settings.audio}</option>
                         </select></td>
                     </tr>
-                    <tr>
-                        <td>extraAudio</td>
-                        <td>Enable extra audio FX (requires audio: true)</td>
-                        <td><select id="settingsEditor-extraAudio">
-                            <option>${window.settings.extraAudio}</option>
-                            <option>${!window.settings.extraAudio}</option>
-                        </select></td>
-                    </tr>
                     <tr>
                         <td>port</td>
                         <td>Local port to use for UI-shell connection</td>
@@ -710,7 +700,6 @@ window.writeSettingsFile = () => {
         theme: document.getElementById("settingsEditor-theme").value,
         termFontSize: Number(document.getElementById("settingsEditor-termFontSize").value),
         audio: (document.getElementById("settingsEditor-audio").value === "true"),
-        extraAudio: (document.getElementById("settingsEditor-extraAudio").value === "true"),
         pingAddr: document.getElementById("settingsEditor-pingAddr").value,
         port: Number(document.getElementById("settingsEditor-port").value),
         monitor: Number(document.getElementById("settingsEditor-monitor").value),

diff --git a/src/assets/audio/beep5.wav b/src/assets/audio/beep5.wav
diff --git a/src/assets/audio/intro.wav b/src/assets/audio/intro.wav
diff --git a/src/assets/audio/ping.wav b/src/assets/audio/ping.wav
diff --git a/src/assets/audio/pingFailed.wav b/src/assets/audio/pingFailed.wav
diff --git a/src/assets/audio/scan.wav b/src/assets/audio/scan.wav
diff --git a/src/classes/audiofx.class.js b/src/classes/audiofx.class.js
@@ -30,26 +30,6 @@ class AudioManager {
             Howler.volume(0.0);
         }
 
-        if (window.settings.audio === true && window.settings.extraAudio === true) {
-            this.beep5 = new Howl({
-                src: [path.join(__dirname, "assets", "audio", "beep5.wav")]
-            });
-            this.intro = new Howl({
-                src: [path.join(__dirname, "assets", "audio", "intro.wav")]
-            });
-            this.scan = new Howl({
-                src: [path.join(__dirname, "assets", "audio", "scan.wav")]
-            });
-            this.ping = new Howl({
-                src: [path.join(__dirname, "assets", "audio", "ping.wav")],
-                volume: 0.02
-            });
-            this.pingFailed = new Howl({
-                src: [path.join(__dirname, "assets", "audio", "pingFailed.wav")],
-                volume: 0.02
-            });
-        }
-
         // Return a proxy to avoid errors if sounds aren't loaded
         return new Proxy(this, {
             get: (target, sound) => {

diff --git a/src/classes/clock.class.js b/src/classes/clock.class.js
@@ -19,10 +19,6 @@ class Clock {
         let time = new Date();
         let array = [time.getHours(), time.getMinutes(), time.getSeconds()];
 
-        if (this.lastTime.getMinutes() !== array[1]) {
-            window.audioManager.beep5.play();
-        }
-
         array.forEach((e, i) => {
             if (e.toString().length !== 2) {
                 array[i] = "0"+e;