logan/DRBv3
1
0
Fork 0
Code Issues 24 Pull Requests Actions Packages Projects Releases Wiki Activity

#18

Browse Source 
- When grabbing the device from the CLI, we now add it to a new var
- We then add new var as the device so we can specify the group
- Updated the default UDP port in the audio device for OP25 config
This commit is contained in:
Logan Cusano
2024-03-10 00:03:30 -05:00
parent 73da7ee2f4
commit 7983670c81
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/discordAudioBot/dabSettings.mjs
View File

@@ -11,8 +11,9 @@ let type = "dshow";
if (os.platform() === 'linux') { if (os.platform() === 'linux') {
await new Promise((res) => { await new Promise((res) => {
executeCommand("pactl", ['list', 'short', 'sources']).then(cliOutput => { executeCommand("pactl", ['list', 'short', 'sources']).then(cliOutput => {
device = extractValue(cliOutput, '(?:\\d(?:\\t|[\\s]{1,9})(?<device>[\\w\\d\\-\\.\\_]+?)(?:\\t|[\\s]{1,9})(?<card>[\\w\\d\\-\\.\\_]+)(?:\\t|[\\s]{1,9})(?:(?<device_type>[\\w\\d\\-\\.\\_]+?) (?<channels>\\dch) (?<frequency>\\d+Hz))(?:\\t|[\\s]{1,9})(?:IDLE|RUNNING|SUSPENDED))') const extracted_device_details = extractValue(cliOutput, '(?:\\d(?:\\t|[\\s]{1,9})(?<device>[\\w\\d\\-\\.\\_]+?)(?:\\t|[\\s]{1,9})(?<card>[\\w\\d\\-\\.\\_]+)(?:\\t|[\\s]{1,9})(?:(?<device_type>[\\w\\d\\-\\.\\_]+?) (?<channels>\\dch) (?<frequency>\\d+Hz))(?:\\t|[\\s]{1,9})(?:IDLE|RUNNING|SUSPENDED))')
console.log("Device:", device.groups.device); device = extracted_device_details.groups.device;
console.log("Device:", device);
res(); res();
}); });
}); });

2
client/op25Handler/modules/op25ConfigGenerators.mjs
View File

@@ -150,7 +150,7 @@ class trunkingConfig {
} }
class audioConfig { class audioConfig {
constructor({ module = "sockaudio.py", port = 23457, deviceName = "default" }) { constructor({ module = "sockaudio.py", port = 23456, deviceName = "default" }) {
this.module = module; this.module = module;
this.instances = [{ this.instances = [{
"instance_name": "audio0", "instance_name": "audio0",