alsa, alsabar: make amixer call customizable; fixes #111 in general

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index 7d250962374a2df2c78180bae4fbadbf092c183c..a3568923f35e7fd632a974d391ab2a92cf418859 100644 (file)
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -26,13 +26,13 @@ local function worker(args)
     local timeout  = args.timeout or 5
     local settings = args.settings or function() end
 
-    alsa.card    = args.card or "0"
+    alsa.cmd     = args.cmd or "amixer"
     alsa.channel = args.channel or "Master"
 
     alsa.widget = wibox.widget.textbox('')
 
     function alsa.update()
-        local f = assert(io.popen(string.format("amixer -c %s -M get %s", alsa.card, alsa.channel)))
+        local f = assert(io.popen(string.format("%s get %s", alsa.cmd, alsa.channel)))
         local mixer = f:read("*a")
         f:close()
 

diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua
index b2cba9e1675b502c93a07ea26be6369844c0decc..1421975571993b8a173262e5a804c19c58b8f3d3 100644 (file)
--- a/widgets/alsabar.lua
+++ b/widgets/alsabar.lua
@@ -70,9 +70,11 @@ function alsabar.notify()
         preset.title = alsabar.channel .. " - " .. alsabar._current_level .. "%"
     end
 
-    local int = math.modf((alsabar._current_level / 100) * alsabar.notifications.bar_size)
-    preset.text = string.format("[%s%s]", string.rep("|", int),
-                  string.rep(" ", alsabar.notifications.bar_size - int))
+    int = math.modf((alsabar._current_level / 100) * alsabar.notifications.bar_size)
+    preset.text = "["
+                .. string.rep("|", int)
+                .. string.rep(" ", alsabar.notifications.bar_size - int)
+                .. "]"
 
     if alsabar._notify ~= nil then
         alsabar._notify = naughty.notify ({
@@ -87,19 +89,19 @@ function alsabar.notify()
 end
 
 local function worker(args)
-    local args = args or {}
-    local timeout = args.timeout or 4
-    local settings = args.settings or function() end
-    local width = args.width or 63
-    local height = args.heigth or 1
-    local ticks = args.ticks or false
+    local args       = args or {}
+    local timeout    = args.timeout or 4
+    local settings   = args.settings or function() end
+    local width      = args.width or 63
+    local height     = args.heigth or 1
+    local ticks      = args.ticks or false
     local ticks_size = args.ticks_size or 7
-    local vertical = args.vertical or false
+    local vertical   = args.vertical or false
 
-    alsabar.card = args.card or alsabar.card
-    alsabar.channel = args.channel or alsabar.channel
-    alsabar.step = args.step or alsabar.step
-    alsabar.colors = args.colors or alsabar.colors
+    alsabar.cmd           = args.cmd or "amixer"
+    alsabar.channel       = args.channel or alsabar.channel
+    alsabar.step          = args.step or alsabar.step
+    alsabar.colors        = args.colors or alsabar.colors
     alsabar.notifications = args.notifications or alsabar.notifications
 
     alsabar.bar = awful.widget.progressbar()
@@ -115,7 +117,7 @@ local function worker(args)
 
     function alsabar.update()
         -- Get mixer control contents
-        local f = assert(io.popen(string.format("amixer -c %s -M get %s", alsabar.card, alsabar.channel)))
+        local f = assert(io.popen(string.format("%s get %s", alsabar.cmd, alsabar.channel)))
         local mixer = f:read("*a")
         f:close()