Merge branch 'master' of https://github.com/MaximeCheramy/lain into MaximeCheramy...

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

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index 1d2c61737895c27c9c2d7550f3f3ad1636e6215a..19720509c8d247a955aad076360974ef22841d92 100644 (file)
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -30,7 +30,7 @@ local mpd = {}
 
 local function worker(args)
     local args        = args or {}
-    local timeout     = args.timeout or 1
+    local timeout     = args.timeout or 2
     local password    = args.password or ""
     local host        = args.host or "127.0.0.1"
     local port        = args.port or "6600"
@@ -49,17 +49,17 @@ local function worker(args)
 
     mpd_notification_preset = {
         title   = "Now playing",
-        timeout = 5
+        timeout = 6
     }
 
-    helpers.set_map("current mpd track", "")
-    helpers.set_map("current mpd file", "")
+    helpers.set_map("current mpd track", nil)
 
     function mpd.update()
         async.request(echo .. " | curl --connect-timeout 1 -fsm 3 " .. mpdh, function (f)
             mpd_now = {
                 state   = "N/A",
                 file    = "N/A",
+                name    = "N/A",
                 artist  = "N/A",
                 title   = "N/A",
                 album   = "N/A",
@@ -85,13 +85,8 @@ local function worker(args)
 
             mpd_notification_preset.text = string.format("%s (%s) - %s\n%s", mpd_now.artist,
                                            mpd_now.album, mpd_now.date, mpd_now.title)
-
-            if mpd_now.file ~= helpers.get_map("current mpd file")
-            then
-                widget = mpd.widget
-                settings()
-                helpers.set_map("current mpd file", mpd_now.file)
-            end
+            widget = mpd.widget
+            settings()
 
             if mpd_now.state == "play"
             then