alsa: added card, channel to widget table

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

diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua
index 4430e76f47781e594240385c9014dbfb0516cf57..fa10bc2e4215ad1e16d42e7bc27aa4ac93f05205 100644 (file)
--- a/widgets/alsabar.lua
+++ b/widgets/alsabar.lua
@@ -25,6 +25,7 @@ local setmetatable = setmetatable
 -- ALSA volume bar
 -- lain.widgets.alsabar
 local alsabar = {
 -- ALSA volume bar
 -- lain.widgets.alsabar
 local alsabar = {

+    card    = "0",

     channel = "Master",
     step    = "5%",
 
     channel = "Master",
     step    = "5%",
 


@@ -41,7 +42,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 +57,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 +80,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


@@ -97,6 +98,7 @@ local function worker(args)
     local ticks_size = args.ticks_size or 7
     local vertical = args.vertical or false
 
     local ticks_size = args.ticks_size or 7
     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.channel = args.channel or alsabar.channel
     alsabar.step = args.step or alsabar.step
     alsabar.colors = args.colors or alsabar.colors


@@ -115,8 +117,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 = assert(io.popen(string.format("amixer -c %s -M get %s", alsabar.card, alsabar.channel)))
+        local mixer = f:read("*a")

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


@@ -129,7 +131,6 @@ local function worker(args)
 
         alsabar._current_level = tonumber(volu)
         alsabar.bar:set_value(alsabar._current_level / 100)
 
         alsabar._current_level = tonumber(volu)
         alsabar.bar:set_value(alsabar._current_level / 100)

-

         if not mute and tonumber(volu) == 0 or mute == "off"
         then
             alsabar._muted = true
         if not mute and tonumber(volu) == 0 or mute == "off"
         then
             alsabar._muted = true


@@ -154,15 +155,15 @@ local function worker(args)
             awful.util.spawn(alsabar.mixer)
           end),
           awful.button ({}, 3, function()
             awful.util.spawn(alsabar.mixer)
           end),
           awful.button ({}, 3, function()

-            awful.util.spawn(string.format("amixer set %s toggle", alsabar.channel))
+            awful.util.spawn(string.format("amixer -c %s set %s toggle", alsabar.card, alsabar.channel))

             alsabar.update()
           end),
           awful.button ({}, 4, function()
             alsabar.update()
           end),
           awful.button ({}, 4, function()

-            awful.util.spawn(string.format("amixer set %s %s+", alsabar.channel, alsabar.step))
+            awful.util.spawn(string.format("amixer -c %s set %s %s+", alsabar.card, alsabar.channel, alsabar.step))

             alsabar.update()
           end),
           awful.button ({}, 5, function()
             alsabar.update()
           end),
           awful.button ({}, 5, function()

-            awful.util.spawn(string.format("amixer set %s %s-", alsabar.channel, alsabar.step))
+            awful.util.spawn(string.format("amixer -c %s set %s %s-", alsabar.card, alsabar.channel, alsabar.step))

             alsabar.update()
           end)
     ))
             alsabar.update()
           end)
     ))