Updated mpd (markdown)

[etc/awesome.git] / mpd.md

diff --git a/mpd.md b/mpd.md
index ab36d153639b1dec1953b9ece557a4eca7efcef9..8a25d0454ab5183b72ad11bbe19f2dd8d77dbd9e 100644 (file)
--- a/mpd.md
+++ b/mpd.md
@@ -14,7 +14,7 @@ Now playing songs are notified like this:
        | +-------+                                              |
        +--------------------------------------------------------+
 
        | +-------+                                              |
        +--------------------------------------------------------+
 

-The function takes a table as optional argument, which can contain:
+### input table

 
 Variable | Meaning | Type | Default
 --- | --- | --- | ---
 
 Variable | Meaning | Type | Default
 --- | --- | --- | ---


@@ -27,24 +27,20 @@ Variable | Meaning | Type | Default
 
 `settings` can use `mpd_now` table, which contains the following string values:
 
 
 `settings` can use `mpd_now` table, which contains the following string values:
 

-- state
+- state (possible values: "play", "pause", "stop")

 - file
 - artist
 - title
 - album
 - date
 
 - file
 - artist
 - title
 - album
 - date
 

-and can modify `notification_preset` table, which will be the preset for the naughty notifications. Check [here](http://awesome.naquadah.org/doc/api/modules/naughty.html#notify) for the list of variables it can contain. Default definition:
+and can modify `mpd_notification_preset` table, which will be the preset for the naughty notifications. Check [here](http://awesome.naquadah.org/doc/api/modules/naughty.html#notify) for the list of variables it can contain. Default definition:

 
 

-    notification _preset = {
+    mpd_notification _preset = {

        title   = "Now playing",
        title   = "Now playing",

-       text    = mpd_now.artist .. " ("   ..
-                 mpd_now.album  .. ") - " ..
-                 mpd_now.date   .. "\n"   ..
-                 mpd_now.title,
-       fg      = beautiful.fg_normal or "#FFFFFF",
-       bg      = beautiful.bg_normal or "#000000",
-       timeout = 6
+       timeout = 6,
+       text    = string.format("%s (%s) - %s\n%s", mpd_now.artist,
+                 mpd_now.album, mpd_now.date, mpd_now.title)

     }
 
 ### output table
     }
 
 ### output table


@@ -52,7 +48,7 @@ and can modify `notification_preset` table, which will be the preset for the nau
 Variable | Meaning | Type
 --- | --- | ---
 `widget` | The textbox | `wibox.widget.textbox`
 Variable | Meaning | Type
 --- | --- | ---
 `widget` | The textbox | `wibox.widget.textbox`

-`notify` | The notification | function
+`update` | The notification | function

 
 You can control the widget with key bindings like these:
 
 
 You can control the widget with key bindings like these:
 


@@ -60,22 +56,22 @@ You can control the widget with key bindings like these:
     awful.key({ altkey, "Control" }, "Up",
         function ()
             awful.util.spawn_with_shell("mpc toggle || ncmpcpp toggle || ncmpc toggle || pms toggle")
     awful.key({ altkey, "Control" }, "Up",
         function ()
             awful.util.spawn_with_shell("mpc toggle || ncmpcpp toggle || ncmpc toggle || pms toggle")

-            mpdwidget.notify()
+            mpdwidget.update()

         end),
     awful.key({ altkey, "Control" }, "Down",
         function ()
             awful.util.spawn_with_shell("mpc stop || ncmpcpp stop || ncmpc stop || pms stop")
         end),
     awful.key({ altkey, "Control" }, "Down",
         function ()
             awful.util.spawn_with_shell("mpc stop || ncmpcpp stop || ncmpc stop || pms stop")

-            mpdwidget.notify()
+            mpdwidget.update()

         end),
     awful.key({ altkey, "Control" }, "Left",
         function ()
             awful.util.spawn_with_shell("mpc prev || ncmpcpp prev || ncmpc prev || pms prev")
         end),
     awful.key({ altkey, "Control" }, "Left",
         function ()
             awful.util.spawn_with_shell("mpc prev || ncmpcpp prev || ncmpc prev || pms prev")

-            mpdwidget.notify()
+            mpdwidget.update()

         end),
     awful.key({ altkey, "Control" }, "Right",
         function ()
             awful.util.spawn_with_shell("mpc next || ncmpcpp next || ncmpc next || pms next")
         end),
     awful.key({ altkey, "Control" }, "Right",
         function ()
             awful.util.spawn_with_shell("mpc next || ncmpcpp next || ncmpc next || pms next")

-            mpdwidget.notify()
+            mpdwidget.update()

         end),
 
 where `altkey = "Mod1"`.
\ No newline at end of file
         end),
 
 where `altkey = "Mod1"`.
\ No newline at end of file