colin/wireplumber
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

monitors/alsa: drop the half-implemented support for the "JACK device"

Browse Source 
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:
George Kiagiadakis
2023-11-13 13:08:31 +02:00
parent d30fcf34a4
commit bac54c8f0e
2 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/config/wireplumber.conf.d/alsa.conf
View File

@@ -6,12 +6,6 @@ wireplumber.settings = {
## The application name for device reservation ## The application name for device reservation
# monitor.alsa.reserve-application-name = WirePlumber # 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 = { monitor.alsa.properties = {

23
src/scripts/monitors/alsa.lua
View File

@@ -11,7 +11,6 @@ log = Log.open_topic ("s-monitors")
defaults = {} defaults = {}
defaults.reserve_priority = -20 defaults.reserve_priority = -20
defaults.reserve_application_name = "WirePlumber" defaults.reserve_application_name = "WirePlumber"
defaults.jack_device = false
defaults.properties = Json.Object {} defaults.properties = Json.Object {}
defaults.vm_node_defaults = 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) "monitor.alsa.reserve-priority", defaults.reserve_priority)
config.reserve_application_name = Conf.get_value_string ("wireplumber.settings", config.reserve_application_name = Conf.get_value_string ("wireplumber.settings",
"monitor.alsa.reserve-application-name", defaults.reserve_application_name) "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 ( config.properties = Conf.get_section (
"monitor.alsa.properties", defaults.properties):parse () "monitor.alsa.properties", defaults.properties):parse ()
config.vm_node_defaults = Conf.get_section ( config.vm_node_defaults = Conf.get_section (
@@ -318,17 +315,6 @@ function prepareDevice(parent, id, obj_type, factory, properties)
rd:call("release") rd:call("release")
end) 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") rd:call("acquire")
else else
-- create the device -- create the device
@@ -376,15 +362,6 @@ function createMonitor ()
return m return m
end 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 -- 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 -- it is expected to be connected. if it is not, assume the d-bus connection
-- has failed and continue without it -- has failed and continue without it