]> 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:

remove naughty
[etc/awesome.git] / widgets / alsa.lua
index 887f398cc11670ceccd3a518f1dcb0c6ca07db92..114e2b2744d5cfc9bad45ef2cfa444d370ae4145 100644 (file)
@@ -1,10 +1,10 @@
 
 --[[
 
 --[[
-                                                      
-     Licensed under GNU General Public License v2     
-      * (c) 2013, Luke Bonham                         
-      * (c) 2010, Adrian C. <anrxc@sysphere.org>      
-                                                      
+                                                  
+     Licensed under GNU General Public License v2 
+      * (c) 2013, Luke Bonham                     
+      * (c) 2010, Adrian C. <anrxc@sysphere.org>  
+                                                  
 --]]
 
 local newtimer        = require("lain.helpers").newtimer
 --]]
 
 local newtimer        = require("lain.helpers").newtimer
@@ -23,36 +23,37 @@ local alsa = {}
 local function worker(args)
     local args     = args or {}
     local timeout  = args.timeout or 5
 local function worker(args)
     local args     = args or {}
     local timeout  = args.timeout or 5
-    local channel  = args.channel or "Master"
+    local channel  = args.channel or "Master -c 1"
     local settings = args.settings or function() end
 
     alsa.widget = wibox.widget.textbox('')
 
     function alsa.update()
     local settings = args.settings or function() end
 
     alsa.widget = wibox.widget.textbox('')
 
     function alsa.update()
-        local f = io.popen('amixer get ' .. channel)
+        local f = assert(io.popen('amixer get ' .. channel))
         local mixer = f:read("*all")
         f:close()
 
         local mixer = f:read("*all")
         f:close()
 
-        volume = {}
+        volume_now = {}
 
 
-        volume.level, volume.status = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
+        volume_now.level, volume_now.status = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
 
 
-        if volume.level == nil
+        if volume_now.level == nil
         then
         then
-            volume.level  = 0
-            volume.status = "off"
+            volume_now.level  = "0"
+            volume_now.status = "off"
         end
 
         end
 
-        if volume.status == ""
+        if volume_now.status == ""
         then
         then
-            if volume.level == 0
+            if volume_now.level == "0"
             then
             then
-                volume.status = "off"
+                volume_now.status = "off"
             else
             else
-                volume.status = "on"
+                volume_now.status = "on"
             end
         end
 
             end
         end
 
+        widget = alsa.widget
         settings()
     end
 
         settings()
     end