logan/DRB-CnC
1
0
Fork 0
Code Issues 23 Pull Requests Packages Projects 1 Releases Wiki Activity

Fixing imports and resolutions

Browse Source
This commit is contained in:
Logan Cusano
2023-03-26 20:32:21 -04:00
parent c15d8ca5ee
commit f995cd3578
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Client/controllers/audioController.js
View File

@@ -16,25 +16,27 @@ const log = new DebugBuilder("client-bot", "audioController");
* @param deviceId The ID of the device being queried * @param deviceId The ID of the device being queried
* @returns {unknown} * @returns {unknown}
*/ */
exports.confirmAudioDevice = async function confirmAudioDevice({deviceName = undefined, deviceId = undefined}){ async function confirmAudioDevice({deviceName = undefined, deviceId = undefined}){
const deviceList = await getAudioDevices(); const deviceList = await getAudioDevices();
if (!deviceName && !deviceId) throw new Error("No device given"); if (!deviceName && !deviceId) throw new Error("No device given");
if (deviceId) return deviceList.find(device => device.id === deviceId); if (deviceId) return deviceList.find(device => device.id === deviceId);
if (deviceName) return deviceList.find(device => device.name === deviceName); if (deviceName) return deviceList.find(device => device.name === deviceName);
} }
exports.confirmAudioDevice = confirmAudioDevice;
/** /**
* Return a list of the audio devices connected with input channels * Return a list of the audio devices connected with input channels
* *
* @returns {unknown[]} * @returns {unknown[]}
*/ */
exports.getAudioDevices = async function getAudioDevices(){ async function getAudioDevices(){
// Exec output contains both stderr and stdout outputs // Exec output contains both stderr and stdout outputs
const deviceList = await returnAlsaDeviceObject(); const deviceList = await returnAlsaDeviceObject();
log.DEBUG("Device list: ", deviceList); log.DEBUG("Device list: ", deviceList);
return deviceList; return deviceList;
} }
exports.getAudioDevices = getAudioDevices;
/** /**
* Create and return the audio instance from the saved settings * Create and return the audio instance from the saved settings
@@ -42,8 +44,8 @@ exports.getAudioDevices = async function getAudioDevices(){
* *
* @returns new portAudio.AudioIO * @returns new portAudio.AudioIO
*/ */
exports.createAudioInstance = async function createAudioInstance() { async function createAudioInstance() {
const selectedDevice = await this.confirmAudioDevice({deviceId: getDeviceID()});//{deviceName: "VoiceMeeter VAIO3 Output (VB-Au"}); const selectedDevice = await confirmAudioDevice({deviceId: getDeviceID()});//{deviceName: "VoiceMeeter VAIO3 Output (VB-Au"});
log.DEBUG("Device selected from config: ", selectedDevice); log.DEBUG("Device selected from config: ", selectedDevice);
// Create an instance of AudioIO with outOptions (defaults are as below), which will return a WritableStream // Create an instance of AudioIO with outOptions (defaults are as below), which will return a WritableStream
return new alsaInstance({ return new alsaInstance({
@@ -55,4 +57,5 @@ exports.createAudioInstance = async function createAudioInstance() {
periodTime: undefined, periodTime: undefined,
// highwaterMark: 3840 // highwaterMark: 3840
}); });
} }
exports.createAudioInstance = createAudioInstance;

3
Client/utilities/configHandler.js
View File

@@ -6,7 +6,8 @@ const { readFileSync } = require('fs');
const path = require("path"); const path = require("path");
function getConfig() { function getConfig() {
return JSON.parse(readFileSync(path.resolve("../config/botConfig.json"))); const botConfigObj = JSON.parse(readFileSync(path.resolve("./config/botConfig.json")))
return botConfigObj;
} }
exports.getConfig = getConfig; exports.getConfig = getConfig;