From 85cc3d9bf7ba3d4f12c7cc70db593ac6d2852850 Mon Sep 17 00:00:00 2001 From: lawl Date: Fri, 8 Apr 2022 18:28:02 +0200 Subject: modules: Append original device name to virtual microphone --- module.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/module.go b/module.go index 8e6b87a..1381a16 100644 --- a/module.go +++ b/module.go @@ -40,7 +40,7 @@ func supressorState(ctx *ntcontext) (int, bool) { var virtualDeviceInUse bool = false if ctx.config.FilterInput { if ctx.serverInfo.servertype == servertype_pipewire { - module, ladspasource, err := findModule(c, "module-ladspa-source", "source_name='NoiseTorch Microphone'") + module, ladspasource, err := findModule(c, "module-ladspa-source", "source_name='NoiseTorch Microphone") if err != nil { log.Printf("Couldn't fetch module list to check for module-ladspa-source: %v\n", err) } @@ -195,9 +195,9 @@ func loadModule(ctx *ntcontext, module, args string) (uint32, error) { func loadPipeWireInput(ctx *ntcontext, inp *device) error { log.Printf("Loading supressor for pipewire\n") idx, err := loadModule(ctx, "module-ladspa-source", - fmt.Sprintf("source_name='NoiseTorch Microphone' master=%s "+ + fmt.Sprintf("source_name='NoiseTorch Microphone for %s' master=%s "+ "rate=48000 channels=1 "+ - "label=noisetorch plugin=%s control=%d", inp.ID, ctx.librnnoise, ctx.config.Threshold)) + "label=noisetorch plugin=%s control=%d", inp.Name, inp.ID, ctx.librnnoise, ctx.config.Threshold)) if err != nil { return err @@ -252,8 +252,8 @@ func loadPulseInput(ctx *ntcontext, inp *device) error { log.Printf("Loaded fixed latency loopback as idx: %d\n", idx) } - idx, err = loadModule(ctx, "module-remap-source", `master=nui_mic_denoised_out.monitor `+ - `source_name=nui_mic_remap source_properties="device.description='NoiseTorch Microphone'"`) + idx, err = loadModule(ctx, "module-remap-source", fmt.Sprintf(`master=nui_mic_denoised_out.monitor `+ + `source_name=nui_mic_remap source_properties="device.description='NoiseTorch Microphone for %s'"`, inp.Name)) if err != nil { return err } @@ -306,7 +306,7 @@ func unloadSupressorPipeWire(ctx *ntcontext) error { log.Printf("Searching for module-ladspa-source\n") c := ctx.paClient - m, found, err := findModule(c, "module-ladspa-source", "source_name='NoiseTorch Microphone'") + m, found, err := findModule(c, "module-ladspa-source", "source_name='NoiseTorch Microphone") if err != nil { return err } -- cgit v1.2.3-54-g00ecf