From fe7924f977929a645e81afead0fde94130be9f5a Mon Sep 17 00:00:00 2001
From: NoobishSVK <ardoniceksvk@gmail.com>
Date: Thu, 21 Mar 2024 15:47:55 +0100
Subject: [PATCH] bugfix for audio crash

---
 server/index.js              | 1 +
 server/stream/3las.server.js | 2 +-
 server/stream/index.js       | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/server/index.js b/server/index.js
index 4c232b6..fc3f4a7 100644
--- a/server/index.js
+++ b/server/index.js
@@ -25,6 +25,7 @@ const { logDebug, logError, logInfo, logWarn } = require('./console');
 const storage = require('./storage');
 const { configName, serverConfig, configUpdate, configSave } = require('./server_config');
 const pjson = require('../package.json');
+require('./stream/index');
 
 console.log(`\x1b[32m
  _____ __  __       ______  __ __        __   _                                  
diff --git a/server/stream/3las.server.js b/server/stream/3las.server.js
index bb9b4ef..65cde62 100644
--- a/server/stream/3las.server.js
+++ b/server/stream/3las.server.js
@@ -49,7 +49,7 @@ const fs_1 = require("fs");
 const child_process_1 = require("child_process");
 const ws = __importStar(require("ws"));
 const wrtc = require('wrtc');
-const Settings = JSON.parse((0, fs_1.readFileSync)('stream/settings.json', 'utf-8'));
+const Settings = JSON.parse((0, fs_1.readFileSync)('server/stream/settings.json', 'utf-8'));
 const FFmpeg_command = (() => {
     if (process.platform === 'win32')
         return Settings.FallbackFFmpegPath;
diff --git a/server/stream/index.js b/server/stream/index.js
index f3f9be3..717c04b 100644
--- a/server/stream/index.js
+++ b/server/stream/index.js
@@ -26,10 +26,10 @@ function enableAudioStream() {
     // Combine all the settings for the ffmpeg command
     if (process.platform === 'win32') {
         // Windows
-        ffmpegCommand = `${flags} -f dshow -audio_buffer_size 50 -i audio="${serverConfig.audio.audioDevice}" ${codec} ${output} pipe:1 | node stream/3las.server.js -port ${serverConfig.webserver.webserverPort + 10} -samplerate 48000 -channels ${serverConfig.audio.audioChannels}`;
+        ffmpegCommand = `${flags} -f dshow -audio_buffer_size 50 -i audio="${serverConfig.audio.audioDevice}" ${codec} ${output} pipe:1 | node server/stream/3las.server.js -port ${serverConfig.webserver.webserverPort + 10} -samplerate 48000 -channels ${serverConfig.audio.audioChannels}`;
       } else {
         // Linux
-        ffmpegCommand = `${flags} -f alsa -i "${serverConfig.audio.softwareMode && serverConfig.audio.softwareMode == true ? 'plug' : ''}${serverConfig.audio.audioDevice}" ${codec} ${output} pipe:1 | node stream/3las.server.js -port ${serverConfig.webserver.webserverPort + 10} -samplerate 48000 -channels ${serverConfig.audio.audioChannels}`;
+        ffmpegCommand = `${flags} -f alsa -i "${serverConfig.audio.softwareMode && serverConfig.audio.softwareMode == true ? 'plug' : ''}${serverConfig.audio.audioDevice}" ${codec} ${output} pipe:1 | node server/stream/3las.server.js -port ${serverConfig.webserver.webserverPort + 10} -samplerate 48000 -channels ${serverConfig.audio.audioChannels}`;
     } 
 
     consoleCmd.logInfo("Using audio device: " + serverConfig.audio.audioDevice);