monitors/alsa: drop the half-implemented support for the "JACK device"
Users are recommended to use the JACK bridge instead, nowadays: https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-JACK#jack-bridge
This commit is contained in:
@@ -6,12 +6,6 @@ wireplumber.settings = {
|
||||
|
||||
## The application name for device reservation
|
||||
# monitor.alsa.reserve-application-name = WirePlumber
|
||||
|
||||
## Create a JACK device. This is not enabled by default because
|
||||
## it requires that the PipeWire JACK replacement libraries are
|
||||
## not used by the session manager, in order to be able to
|
||||
## connect to the real JACK server.
|
||||
# monitor.alsa.jack-device = false
|
||||
}
|
||||
|
||||
monitor.alsa.properties = {
|
||||
|
@@ -11,7 +11,6 @@ log = Log.open_topic ("s-monitors")
|
||||
defaults = {}
|
||||
defaults.reserve_priority = -20
|
||||
defaults.reserve_application_name = "WirePlumber"
|
||||
defaults.jack_device = false
|
||||
defaults.properties = Json.Object {}
|
||||
defaults.vm_node_defaults = Json.Object {}
|
||||
|
||||
@@ -20,8 +19,6 @@ config.reserve_priority = Conf.get_value_int ("wireplumber.settings",
|
||||
"monitor.alsa.reserve-priority", defaults.reserve_priority)
|
||||
config.reserve_application_name = Conf.get_value_string ("wireplumber.settings",
|
||||
"monitor.alsa.reserve-application-name", defaults.reserve_application_name)
|
||||
config.jack_device = Conf.get_value_boolean ("wireplumber.settings",
|
||||
"monitor.alsa.jack-device", defaults.jack_device)
|
||||
config.properties = Conf.get_section (
|
||||
"monitor.alsa.properties", defaults.properties):parse ()
|
||||
config.vm_node_defaults = Conf.get_section (
|
||||
@@ -318,17 +315,6 @@ function prepareDevice(parent, id, obj_type, factory, properties)
|
||||
rd:call("release")
|
||||
end)
|
||||
|
||||
if jack_device then
|
||||
rd:connect("notify::owner-name-changed", function (rd, pspec)
|
||||
if rd["state"] == "busy" and
|
||||
rd["owner-application-name"] == "Jack audio server" then
|
||||
-- TODO enable the jack device
|
||||
else
|
||||
-- TODO disable the jack device
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
rd:call("acquire")
|
||||
else
|
||||
-- create the device
|
||||
@@ -376,15 +362,6 @@ function createMonitor ()
|
||||
return m
|
||||
end
|
||||
|
||||
-- create the JACK device (for PipeWire to act as client to a JACK server)
|
||||
if config.jack_device then
|
||||
jack_device = Device("spa-device-factory", {
|
||||
["factory.name"] = "api.jack.device",
|
||||
["node.name"] = "JACK-Device",
|
||||
})
|
||||
jack_device:activate(Feature.Proxy.BOUND)
|
||||
end
|
||||
|
||||
-- if the reserve-device plugin is enabled, at the point of script execution
|
||||
-- it is expected to be connected. if it is not, assume the d-bus connection
|
||||
-- has failed and continue without it
|
||||
|
Reference in New Issue
Block a user