]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/alsa.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Fix typo so notification_preset can be overidden
[etc/awesome.git] / widgets / alsa.lua
index cb7ba49add0df8fbfcb8a7d6168e950eda72e467..f73194b2a6c9b23dfc35394ed48864fd856e3dad 100644 (file)
@@ -16,26 +16,28 @@ local setmetatable = setmetatable
 
 -- ALSA volume
 -- lain.widgets.alsa
 
 -- ALSA volume
 -- lain.widgets.alsa
-local alsa = helpers.make_widget_textbox()
 
 local function worker(args)
 
 local function worker(args)
+    local alsa     = { widget = wibox.widget.textbox() }
     local args     = args or {}
     local timeout  = args.timeout or 5
     local settings = args.settings or function() end
 
     local args     = args or {}
     local timeout  = args.timeout or 5
     local settings = args.settings or function() end
 
+    alsa.cmd           = args.cmd or "amixer"
     alsa.channel       = args.channel or "Master"
     alsa.channel       = args.channel or "Master"
-    alsa.cmd           = args.cmd or "amixer sget " .. alsa.channel
     alsa.togglechannel = args.togglechannel
 
     alsa.togglechannel = args.togglechannel
 
+    local format_cmd = string.format("%s get %s", alsa.cmd, alsa.channel)
+
     if alsa.togglechannel then
     if alsa.togglechannel then
-        alsa.cmd = { shell, "-c", string.format("%s get %s; %s get %s",
+        format_cmd = { shell, "-c", string.format("%s get %s; %s get %s",
         alsa.cmd, alsa.channel, alsa.cmd, alsa.togglechannel) }
     end
 
     alsa.last = {}
 
     function alsa.update()
         alsa.cmd, alsa.channel, alsa.cmd, alsa.togglechannel) }
     end
 
     alsa.last = {}
 
     function alsa.update()
-        helpers.async(alsa.cmd, function(mixer)
+        helpers.async(format_cmd, function(mixer)
             local l,s = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
             if alsa.last.level ~= l or alsa.last.status ~= s then
                 volume_now = { level = l, status = s }
             local l,s = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
             if alsa.last.level ~= l or alsa.last.status ~= s then
                 volume_now = { level = l, status = s }
@@ -48,7 +50,7 @@ local function worker(args)
 
     helpers.newtimer(string.format("alsa-%s-%s", alsa.cmd, alsa.channel), timeout, alsa.update)
 
 
     helpers.newtimer(string.format("alsa-%s-%s", alsa.cmd, alsa.channel), timeout, alsa.update)
 
-    return setmetatable(alsa, { __index = alsa.widget })
+    return alsa
 end
 
 end
 
-return setmetatable(alsa, { __call = function(_, ...) return worker(...) end })
+return setmetatable({}, { __call = function(_, ...) return worker(...) end })