awesomewm-mirrors
/
lain
mirror of https://github.com/lcpz/lain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #362 from 2009/fix/pulse-sink 

Add devicetype to pulsebar to match pulseaudio and update sed command
This commit is contained in:
Luke Bonham 2017-09-13 11:13:44 +02:00 committed by GitHub
parent 794f5d3220 614b4b6396
commit c2b186467c
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
widget/pulseaudio.lua
View File

@ -24,7 +24,7 @@ local function factory(args)
pulseaudio.device = "N/A" pulseaudio.device = "N/A"
pulseaudio.devicetype = args.devicetype or "sink" pulseaudio.devicetype = args.devicetype or "sink"
pulseaudio.cmd = args.cmd or "pacmd list-" .. pulseaudio.devicetype .. "s | sed -n -e '0,/*/d' -e '/base volume/d' -e '/volume:/p' -e '/muted:/p' -e '/device\\.string/p'" pulseaudio.cmd = args.cmd or "pacmd list-" .. pulseaudio.devicetype .. "s | sed -n -e '/*/,$!d' -e '/index/p' -e '/base volume/d' -e '/volume:/p' -e '/muted:/p' -e '/device\\.string/p'"
function pulseaudio.update() function pulseaudio.update()
if scallback then pulseaudio.cmd = scallback() end if scallback then pulseaudio.cmd = scallback() end

11
widget/pulsebar.lua
View File

@ -42,11 +42,13 @@ local function factory(args)
local scallback = args.scallback local scallback = args.scallback
pulsebar.cmd = args.cmd or "pacmd list-sinks | sed -n -e '0,/*/d' -e '/base volume/d' -e '/volume:/p' -e '/muted:/p' -e '/device\\.string/p'" pulsebar.cmd = args.cmd or "pacmd list-sinks | sed -n -e '0,/*/d' -e '/base volume/d' -e '/volume:/p' -e '/muted:/p' -e '/device\\.string/p'"
pulsebar.sink = args.sink or 0 pulsebar.sink = args.sink or 0 -- Legacy, does nothing
pulsebar.colors = args.colors or pulsebar.colors pulsebar.colors = args.colors or pulsebar.colors
pulsebar.followtag = args.followtag or false pulsebar.followtag = args.followtag or false
pulsebar.notification_preset = args.notification_preset pulsebar.notification_preset = args.notification_preset
pulsebar.device = "N/A" pulsebar.device = "N/A"
pulsebar.devicetype = args.devicetype or "sink"
pulsebar.cmd = args.cmd or "pacmd list-" .. pulsebar.devicetype .. "s | sed -n -e '/*/,$!d' -e '/index/p' -e '/base volume/d' -e '/volume:/p' -e '/muted:/p' -e '/device\\.string/p'"
if not pulsebar.notification_preset then if not pulsebar.notification_preset then
pulsebar.notification_preset = {} pulsebar.notification_preset = {}
@ -73,7 +75,8 @@ local function factory(args)
helpers.async({ awful.util.shell, "-c", pulsebar.cmd }, function(s) helpers.async({ awful.util.shell, "-c", pulsebar.cmd }, function(s)
volume_now = { volume_now = {
index = string.match(s, "index: (%S+)") or "N/A", index = string.match(s, "index: (%S+)") or "N/A",
sink = string.match(s, "device.string = \"(%S+)\"") or "N/A", device = string.match(s, "device.string = \"(%S+)\"") or "N/A",
sink = device, -- legacy API
muted = string.match(s, "muted: (%S+)") or "N/A" muted = string.match(s, "muted: (%S+)") or "N/A"
} }
@ -103,7 +106,7 @@ local function factory(args)
pulsebar.bar.color = pulsebar.colors.mute pulsebar.bar.color = pulsebar.colors.mute
else else
pulsebar._mute = "no" pulsebar._mute = "no"
pulsebar.tooltip:set_text(string.format("%s: %s", pulsebar.sink, volu)) pulsebar.tooltip:set_text(string.format("%s: %s", pulsebar.device, volu))
pulsebar.bar.color = pulsebar.colors.unmute pulsebar.bar.color = pulsebar.colors.unmute
end end
@ -118,7 +121,7 @@ local function factory(args)
pulsebar.update(function() pulsebar.update(function()
local preset = pulsebar.notification_preset local preset = pulsebar.notification_preset
preset.title = string.format("Sink %s - %s%%", pulsebar.sink, pulsebar._current_level) preset.title = string.format("Sink %s - %s%%", pulsebar.device, pulsebar._current_level)
if pulsebar._mute == "yes" then if pulsebar._mute == "yes" then
preset.title = preset.title .. " Muted" preset.title = preset.title .. " Muted"