diff --git a/src/scripts/create-item.lua b/src/scripts/create-item.lua index 4ef84ee0..f8caf3d6 100644 --- a/src/scripts/create-item.lua +++ b/src/scripts/create-item.lua @@ -16,7 +16,7 @@ function configProperties (node) ["item.node"] = node, ["item.plugged.usec"] = GLib.get_monotonic_time (), ["item.features.no-dsp"] = - Settings.get ("default-policy-audio.no-dsp"):parse(), + Settings.parse_boolean_safe ("default-policy-audio.no-dsp", false), ["item.features.monitor"] = true, ["item.features.control-port"] = false, ["node.id"] = node ["bound-id"], diff --git a/src/scripts/monitors/v4l2.lua b/src/scripts/monitors/v4l2.lua index 301e12c0..07ce0ba2 100644 --- a/src/scripts/monitors/v4l2.lua +++ b/src/scripts/monitors/v4l2.lua @@ -5,9 +5,7 @@ -- -- SPDX-License-Identifier: MIT -local config_settings = { - -} +local config_settings = {} -- apply properties from rules defined in JSON .conf file function rulesApplyProperties(properties) diff --git a/src/scripts/policy-bluetooth.lua b/src/scripts/policy-bluetooth.lua index c8884938..2aa982ed 100644 --- a/src/scripts/policy-bluetooth.lua +++ b/src/scripts/policy-bluetooth.lua @@ -27,9 +27,9 @@ -- settings file: policy.conf local use_persistent_storage = - Settings.get ("bt-policy-use-persistent-storage"):parse() or false + Settings.parse_boolean_safe ("bt-policy-use-persistent-storage", false) local use_headset_profile = - Settings.get ("bt-policy-media-role.use-headset-profile"):parse() or false + Settings.parse_boolean_safe ("bt-policy-media-role.use-headset-profile", true) local applications = {} local profile_restore_timeout_msec = 2000 @@ -45,8 +45,8 @@ local last_profiles = {} local active_streams = {} local previous_streams = {} -local apps_setting = Settings.get ("bt-policy-media-role.applications"):parse() - +local apps_setting = + Settings.parse_array_safe ("bt-policy-media-role.applications") for i = 1, #apps_setting do applications [apps_setting [i]] = true end diff --git a/src/scripts/policy-device-routes.lua b/src/scripts/policy-device-routes.lua index cbcfc0e3..e9dfc73e 100644 --- a/src/scripts/policy-device-routes.lua +++ b/src/scripts/policy-device-routes.lua @@ -19,27 +19,11 @@ -- settings file: device.conf local use_persistent_storage = - Settings.get ("device.use-persistent-storage"):parse() or false - --- the default volume to apply (optional property) -local default_volume = 0.4^3 -local default_volume_json = Settings.get ("device.default-volume") -if default_input_volume_json ~= nil then - local val = default_volume_json:parse() - if val ~= nil then - default_volume = val - end -end - --- the default input volume to apply (optional property) -local default_input_volume = 1.0 -local default_input_volume_json = Settings.get ("default-input-volume") -if default_input_volume_json ~= nil then - local val = default_input_volume_json:parse() - if val ~= nil then - default_input_volume = val - end -end + Settings.parse_boolean_safe ("device.use-persistent-storage", true) +local default_volume = + Settings.parse_float_safe ("device.default-volume", 0.4^3) +local default_input_volume = + Settings.parse_float_safe ("default-input-volume", 1.0) -- table of device info dev_infos = {} diff --git a/src/scripts/policy-endpoint-client-links.lua b/src/scripts/policy-endpoint-client-links.lua index f58eecc6..5f16c301 100644 --- a/src/scripts/policy-endpoint-client-links.lua +++ b/src/scripts/policy-endpoint-client-links.lua @@ -5,16 +5,8 @@ -- -- SPDX-License-Identifier: MIT -local duck_level = Settings.get ("default-policy-duck.level"):parse() or 0.3 - -local roles = {} -local roles_json = Settings.get ("endpoints-roles") -if roles_json ~= nil then - local val = roles_json:parse() - if val ~= nil then - roles = val - end -end +local duck_level = Settings.parse_float_safe ("default-policy-duck.level", 0.3) +local roles = Settings.parse_object_safe ("endpoints-roles") function findRole(role) if role and not roles[role] then diff --git a/src/scripts/policy-endpoint-client.lua b/src/scripts/policy-endpoint-client.lua index 5d5cab84..efdcd412 100644 --- a/src/scripts/policy-endpoint-client.lua +++ b/src/scripts/policy-endpoint-client.lua @@ -6,14 +6,8 @@ -- SPDX-License-Identifier: MIT -- Receive script arguments from config.lua -local roles = {} -local roles_json = Settings.get ("endpoints-roles") -if roles_json ~= nil then - local val = roles_json:parse() - if val ~= nil then - roles = val - end -end + +local roles = Settings.parse_object_safe ("endpoints-roles") local self = {} self.scanning = false diff --git a/src/scripts/policy-endpoint-device.lua b/src/scripts/policy-endpoint-device.lua index 1ac41637..8d136cc9 100644 --- a/src/scripts/policy-endpoint-device.lua +++ b/src/scripts/policy-endpoint-device.lua @@ -5,8 +5,8 @@ -- -- SPDX-License-Identifier: MIT -local move = Settings.get ("default-policy-move"):parse() or false -local follow = Settings.get ("default-policy-follow"):parse() or false +local move = Settings.parse_boolean_safe ("default-policy-move", false) +local follow = Settings.parse_boolean_safe ("default-policy-follow", false) local self = {} self.scanning = false diff --git a/src/scripts/policy-hooks.lua b/src/scripts/policy-hooks.lua index 807515bd..e1f205c2 100644 --- a/src/scripts/policy-hooks.lua +++ b/src/scripts/policy-hooks.lua @@ -12,7 +12,7 @@ local putils = require ("policy-utils") local cutils = require ("common-utils") -local move = Settings.get ("default-policy-move"):parse () or false +local move = Settings.parse_boolean_safe ("default-policy-move", false) function parseBool (var) return cutils.parseBool (var) diff --git a/src/scripts/policy-node.lua b/src/scripts/policy-node.lua index 040111e4..7c215da4 100644 --- a/src/scripts/policy-node.lua +++ b/src/scripts/policy-node.lua @@ -16,9 +16,10 @@ -- settings file: policy.conf -local move = Settings.get ("default-policy-move"):parse () or false -local follow = Settings.get ("default-policy-follow"):parse () or false -local filter_forward_format = Settings.get ("filter.forward-format"):parse () or false +local move = Settings.parse_boolean_safe ("default-policy-move", false) +local follow = Settings.parse_boolean_safe ("default-policy-follow", false) +local filter_forward_format = + Settings.parse_boolean_safe ("filter.forward-format", false) local putils = require ("policy-utils") local cutils = require ("common-utils") diff --git a/src/scripts/restore-stream.lua b/src/scripts/restore-stream.lua index 8d33a01d..10269b40 100644 --- a/src/scripts/restore-stream.lua +++ b/src/scripts/restore-stream.lua @@ -18,12 +18,12 @@ -- settings file: stream.conf -config_restore_props = Settings.get ("stream_default.restore-props"):parse() - or false -config_restore_target = Settings.get ("stream_default.restore-target"):parse() - or false -config_default_channel_volume = Settings.get_float ("stream.default-channel-volume") - or 1.0 +config_restore_props = + Settings.parse_boolean_safe ("stream_default.restore-props", false) +config_restore_target = + Settings.parse_boolean_safe ("stream_default.restore-target", false) +config_default_channel_volume = + Settings.parse_float_safe ("stream.default-channel-volume", 1.0) function rulesApplyProperties (properties) local matched, mprops = Settings.apply_rule ("stream_default", properties) diff --git a/src/scripts/static-endpoints.lua b/src/scripts/static-endpoints.lua index 93d2e7a3..daf896d6 100644 --- a/src/scripts/static-endpoints.lua +++ b/src/scripts/static-endpoints.lua @@ -6,14 +6,7 @@ -- SPDX-License-Identifier: MIT -- Receive script arguments from config.lua -local endpoints = {} -local endpoints_json = Settings.get ("endpoints") -if endpoints_json ~= nil then - local val = endpoints_json:parse() - if val ~= nil then - endpoints = val - end -end +local endpoints = Settings.parse_object_safe ("endpoints") function createEndpoint (factory_name, properties) -- create endpoint