{alsa,pulse}bar: show percentage even when muted

diff --git a/widget/alsabar.lua b/widget/alsabar.lua
index fb9c2e489301cbb48fd729ac2c82b96dce8734fa..81fbe2955c3894e4ed8d501ba9d32e5a8676424b 100644 (file)
--- a/widget/alsabar.lua
+++ b/widget/alsabar.lua
@@ -107,11 +107,11 @@ local function factory(args)
     function alsabar.notify()
         alsabar.update(function()
             local preset = alsabar.notification_preset
     function alsabar.notify()
         alsabar.update(function()
             local preset = alsabar.notification_preset

+            
+            preset.title = string.format("%s - %s%%", alsabar.channel, alsabar._current_level)

 
             if alsabar._playback == "off" then
 
             if alsabar._playback == "off" then

-                preset.title = string.format("%s - Muted", alsabar.channel)
-            else
-                preset.title = string.format("%s - %s%%", alsabar.channel, alsabar._current_level)
+                preset.title = preset.title .. " Muted"

             end
 
             int = math.modf((alsabar._current_level / 100) * awful.screen.focused().mywibox.height)
             end
 
             int = math.modf((alsabar._current_level / 100) * awful.screen.focused().mywibox.height)

diff --git a/widget/pulsebar.lua b/widget/pulsebar.lua
index 8914a4e57c69117a87b2f453a031ca2e55db3190..83bfe5e43407577a2b766a68886f3e7b4601d4ee 100644 (file)
--- a/widget/pulsebar.lua
+++ b/widget/pulsebar.lua
@@ -118,11 +118,11 @@ local function factory(args)
     function pulsebar.notify()
         pulsebar.update(function()
             local preset = pulsebar.notification_preset
     function pulsebar.notify()
         pulsebar.update(function()
             local preset = pulsebar.notification_preset

+            
+            preset.title = string.format("Sink %s - %s%%", pulsebar.sink, pulsebar._current_level)

 
             if pulsebar._mute == "yes" then
 
             if pulsebar._mute == "yes" then

-                preset.title = string.format("Sink %s - Muted", pulsebar.sink)
-            else
-                preset.title = string.format("Sink %s - %s%%", pulsebar.sink, pulsebar._current_level)
+                preset.title = preset.title .. " Muted"

             end
 
             int = math.modf((pulsebar._current_level / 100) * awful.screen.focused().mywibox.height)
             end
 
             int = math.modf((pulsebar._current_level / 100) * awful.screen.focused().mywibox.height)