X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/96085317a2e39e7b3594c2df4fe9062a210a6e9b..da2c1cb7783b96a9bd9d10de352a35bacdae6aad:/widgets/mpd.lua?ds=sidebyside

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index 4ee922f..d8bcd78 100644
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -10,13 +10,14 @@
 local helpers      = require("lain.helpers")
 
 local escape_f     = require("awful.util").escape
+local surface      = require("gears").surface
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
 local io           = { popen    = io.popen }
 local os           = { execute  = os.execute,
                        getenv   = os.getenv }
-local string       = { format   = string.format, 
+local string       = { format   = string.format,
                        gmatch   = string.gmatch }
 
 local setmetatable = setmetatable
@@ -28,7 +29,7 @@ local mpd = {}
 local function worker(args)
     local args        = args or {}
     local timeout     = args.timeout or 2
-    local password    = args.password or "\"\""
+    local password    = args.password or ""
     local host        = args.host or "127.0.0.1"
     local port        = args.port or "6600"
     local music_dir   = args.music_dir or os.getenv("HOME") .. "/Music"
@@ -42,15 +43,6 @@ local function worker(args)
 
     mpd.widget = wibox.widget.textbox('')
 
-    mpd_now = {
-        state  = "N/A",
-        file   = "N/A",
-        artist = "N/A",
-        title  = "N/A",
-        album  = "N/A",
-        date   = "N/A"
-    }
-
     mpd_notification_preset = {
         title   = "Now playing",
         timeout = 6
@@ -59,6 +51,15 @@ local function worker(args)
     helpers.set_map("current mpd track", nil)
 
     function mpd.update()
+        mpd_now = {
+            state  = "N/A",
+            file   = "N/A",
+            artist = "N/A",
+            title  = "N/A",
+            album  = "N/A",
+            date   = "N/A"
+        }
+
         local f = io.popen(echo .. " | curl --connect-timeout 1 -fsm 3 " .. mpdh)
 
         for line in f:lines() do
@@ -91,7 +92,7 @@ local function worker(args)
 
                 mpd.id = naughty.notify({
                     preset = mpd_notification_preset,
-                    icon = "/tmp/mpdcover.png",
+                    icon = surface.load_uncached("/tmp/mpdcover.png"),
                     replaces_id = mpd.id
                 }).id
             end