X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/31e3ed277d41e5fc6cbeca33b4285f4ece6da46d..fbe1673b191642a54c673c4f96947dab707dfdfe:/alsabar.md?ds=inline

diff --git a/alsabar.md b/alsabar.md
index 53c49b4..fa5f209 100644
--- a/alsabar.md
+++ b/alsabar.md
@@ -1,12 +1,8 @@
-Shows and controls alsa volume with a progressbar.
+[<- widgets](https://github.com/copycat-killer/lain/wiki/Widgets)
 
-Dependencies:
+Shows and controls alsa volume with a progressbar; provides tooltips, notifications, and color changes at mute/unmute switch.
 
-- alsa-utils (of course)
-
-Plus tooltips, notifications, and color changes at mute/unmute switch.
-
-	myvolumebar = lain.widgets.alsabar()
+	volume = lain.widgets.alsabar()
 
 * Left click: Launch `alsamixer` in your `terminal`.
 * Right click: Mute/unmute.
@@ -16,6 +12,8 @@ The function takes a table as optional argument, which can contain:
 
 Variable | Meaning | Type | Default
 --- | --- | --- | ---
+`timeout` | Refresh timeout seconds | int | 4
+`settings` | User settings | function | empty function
 `width` | Bar width | int | 63
 `height` | Bar height | int | 1
 `ticks` | Set bar ticks on | boolean | true
@@ -40,41 +38,47 @@ Variable | Meaning | Type | Default
 --- | --- | --- | ---
 `font` | Notifications font | string | The one defined in `beautiful.font`
 `font_size` | Notifications font size | string | "11"
+`color` | Notifications color | string | `beautiful.fg_normal`
 `bar_size` | Wibox height | int | 18
 
-It's **crucial** to set `notifications.bar_size` to your `mywibox[s]` height,
-**if** you have set it different than default (18). 
+It's **crucial** to set `notifications.bar_size` to your `mywibox[s]` height.
 
-`lain.widgets.alsabar` outputs the following table:
+`settings` can use the following variables:
+
+Variable | Meaning | Type | Values
+--- | --- | --- | ---
+`volume_now.level` | Self explained | int | 0-100
+`volume_now.status` | Device status | string | "on", "off"
+### output table
 
-Variable | Type
---- | ---
-`widget` | `awful.widget.progressbar`
-`channel` | string
-`step` | string
-`notify` | function
+Variable | Meaning | Type
+--- | --- | ---
+`bar` | The widget | `awful.widget.progressbar`
+`channel` | Alsa channel | string
+`step` | Increase/decrease step | string
+`notify` | The notification | function
 
-Finally, you can control the widget with key bindings like these:
+You can control the widget with key bindings like these:
 
-        -- Volume control
-        awful.key({ altkey }, "Up",
+    -- ALSA volume control
+    awful.key({ altkey }, "Up",
         function ()
-            awful.util.spawn("amixer sset " .. volume.channel .. " " .. volume.step .. "+")
+            awful.util.spawn("amixer -q set " .. volume.channel .. " " .. volume.step .. "+")
             volume.notify()
         end),
-        awful.key({ altkey }, "Down",
+    awful.key({ altkey }, "Down",
         function ()
-            awful.util.spawn("amixer sset " .. volume.channel .. " " .. volume.step .. "-")
+            awful.util.spawn("amixer -q set " .. volume.channel .. " " .. volume.step .. "-")
             volume.notify()
         end),
-        awful.key({ altkey }, "m",
+    awful.key({ altkey }, "m",
         function ()
-            awful.util.spawn("amixer set Master playback toggle")
+            awful.util.spawn("amixer -q set " .. volume.channel .. " playback toggle")
             volume.notify()
         end),
-        awful.key({ altkey, "Control" }, "m", 
+    awful.key({ altkey, "Control" }, "m",
         function ()
-            awful.util.spawn("amixer set Master playback 100%", false )
+            awful.util.spawn("amixer -q set " .. volume.channel .. " playback 100%")
             volume.notify()
         end),