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

Fixing async functions

Browse Source
This commit is contained in:
Logan Cusano
2023-03-26 01:07:30 -04:00
parent 184458608d
commit a8be6598f2
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Client/discord-bot/commands/join.js
View File

@@ -39,7 +39,7 @@ export default async function join({interaction= undefined, guildID= undefined,
selfDeaf: false, selfDeaf: false,
}); });
const audioInstance = createAudioInstance(); const audioInstance = await createAudioInstance();
audioInstance.on('data', buffer => { audioInstance.on('data', buffer => {
buffer = Buffer.from(buffer); buffer = Buffer.from(buffer);

12
Client/discord-bot/controllers/audioController.js
View File

@@ -16,8 +16,8 @@ const log = new ModuleDebugBuilder("bot", "audioController");
* @param deviceId The ID of the device being queried * @param deviceId The ID of the device being queried
* @returns {unknown} * @returns {unknown}
*/ */
export function confirmAudioDevice({deviceName = undefined, deviceId = undefined}){ export async function confirmAudioDevice({deviceName = undefined, deviceId = undefined}){
const deviceList = 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);
@@ -28,9 +28,9 @@ export function confirmAudioDevice({deviceName = undefined, deviceId = undefined
* *
* @returns {unknown[]} * @returns {unknown[]}
*/ */
export function getAudioDevices(){ export async function getAudioDevices(){
// Exec output contains both stderr and stdout outputs // Exec output contains both stderr and stdout outputs
const deviceList = executeAsyncConsoleCommand("arecord -L"); const deviceList = await executeAsyncConsoleCommand("arecord -L");
log.DEBUG("Device list: ", deviceList); log.DEBUG("Device list: ", deviceList);
} }
@@ -40,8 +40,8 @@ export function getAudioDevices(){
* *
* @returns new portAudio.AudioIO * @returns new portAudio.AudioIO
*/ */
export function createAudioInstance() { export async function createAudioInstance() {
const selectedDevice = 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({