Uselesstile code refactoring

[etc/awesome.git] / widgets / alsabar.lua

diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua
index 4430e76f47781e594240385c9014dbfb0516cf57..65a2b33018ea043e6c2458030058e00096fcc9b8 100644 (file)
--- a/widgets/alsabar.lua
+++ b/widgets/alsabar.lua
@@ -41,7 +41,8 @@ local alsabar = {
         font      = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")),
         font_size = "11",
         color     = beautiful.fg_normal,
         font      = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")),
         font_size = "11",
         color     = beautiful.fg_normal,

-        bar_size  = 18
+        bar_size  = 18,
+        screen    = 1

     },
 
     _current_level = 0,
     },
 
     _current_level = 0,


@@ -55,6 +56,7 @@ function alsabar.notify()
         title   = "",
         text    = "",
         timeout = 4,
         title   = "",
         text    = "",
         timeout = 4,

+        screen  = alsabar.notifications.screen,

         font    = alsabar.notifications.font .. " " ..
                   alsabar.notifications.font_size,
         fg      = alsabar.notifications.color
         font    = alsabar.notifications.font .. " " ..
                   alsabar.notifications.font_size,
         fg      = alsabar.notifications.color


@@ -77,12 +79,10 @@ function alsabar.notify()
         alsabar._notify = naughty.notify ({
             replaces_id = alsabar._notify.id,
             preset      = preset,
         alsabar._notify = naughty.notify ({
             replaces_id = alsabar._notify.id,
             preset      = preset,

-            screen = client.focus and client.focus.screen or 1

         })
     else
         alsabar._notify = naughty.notify ({
             preset = preset,
         })
     else
         alsabar._notify = naughty.notify ({
             preset = preset,

-            screen = client.focus and client.focus.screen or 1

         })
     end
 end
         })
     end
 end


@@ -115,8 +115,8 @@ local function worker(args)
 
     function alsabar.update()
         -- Get mixer control contents
 
     function alsabar.update()
         -- Get mixer control contents

-        local f = io.popen("amixer get " .. alsabar.channel)
-        local mixer = f:read("*all")
+        local f = io.popen("amixer -M get " .. alsabar.channel)
+        local mixer = f:read("*a")

         f:close()
 
         -- Capture mixer control state:          [5%] ... ... [on]
         f:close()
 
         -- Capture mixer control state:          [5%] ... ... [on]