From 88f59f07cbe57d1f06ce36d79f056d44d0b5cc99 Mon Sep 17 00:00:00 2001 From: George Kiagiadakis Date: Wed, 3 Feb 2021 12:53:50 +0200 Subject: [PATCH] monitor-alsa: receive script configuration from config.lua --- src/config/config.lua | 11 ++++++++--- src/scripts/monitors/monitor-alsa.lua | 8 ++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/config/config.lua b/src/config/config.lua index 53b3ae83..cbb54b9d 100644 --- a/src/config/config.lua +++ b/src/config/config.lua @@ -30,8 +30,8 @@ function load_script(s, a) end end -function load_monitor(s) - load_script("monitors/monitor-" .. s .. ".lua") +function load_monitor(s, a) + load_script("monitors/monitor-" .. s .. ".lua", a) end -- Session item factories, building blocks for the session management graph @@ -80,7 +80,12 @@ function enable_audio() load_module("reserve-device") -- ALSA device management via udev - load_monitor("alsa") + load_monitor("alsa", { + use_acp = true, + use_device_reservation = true, + enable_midi = true, + enable_jack_client = false, + }) end function enable_bluetooth() diff --git a/src/scripts/monitors/monitor-alsa.lua b/src/scripts/monitors/monitor-alsa.lua index c1ef6582..5398c7ff 100644 --- a/src/scripts/monitors/monitor-alsa.lua +++ b/src/scripts/monitors/monitor-alsa.lua @@ -5,12 +5,8 @@ -- -- SPDX-License-Identifier: MIT -Config = { - use_acp = true, - use_device_reservation = true, - enable_midi = true, - enable_jack_client = false, -} +-- Receive script arguments from config.lua +local Config = ... if Config.enable_midi then midi_bridge = Node("spa-node-factory", {