]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/mpd.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

some fixes
[etc/awesome.git] / widgets / mpd.lua
index dcb7101da5c47c59ee5e75378a2c218e6f90d12a..9a9c28ee2191e99d83d566d22e362584ebe9a327 100644 (file)
@@ -33,11 +33,10 @@ function worker(args)
     local port = args.port or "6600"
     local music_dir = args.music_dir or os.getenv("HOME") .. "/Music"
     local refresh_timeout = args.refresh_timeout or 1
     local port = args.port or "6600"
     local music_dir = args.music_dir or os.getenv("HOME") .. "/Music"
     local refresh_timeout = args.refresh_timeout or 1
-    local notify_timeout = args.notify_timeout or 5
-    local color_artist = args.color_artist or beautiful.fg_normal or "#FFFFFF"
-    local color_song = args.color_song or beautiful.fg_focus or "#FFFFFF"
-    local spr = args.spr or ""
-    local musicplr = args.musicplr or "ncmpcpp"
+    local header_color = args.header_color or beautiful.fg_normal or "#FFFFFF"
+    local color = args.color or beautiful.fg_focus or "#FFFFFF"
+    local spr = args.spr or " "
+    local app = args.app or "ncmpcpp"
     local shadow = args.shadow or false
 
     local mpdcover = helpers.scripts_dir .. "mpdcover"
     local shadow = args.shadow or false
 
     local mpdcover = helpers.scripts_dir .. "mpdcover"
@@ -54,7 +53,7 @@ function worker(args)
             then
                 mympd:set_text('')
             else
             then
                 mympd:set_text('')
             else
-                mympd:set_markup(markup(color_artist, " mpd "), markup(color_song , "off "))
+                mympd:set_markup(markup(header_color, " mpd "), markup(color , "off "))
             end
         end
 
             end
         end
 
@@ -98,20 +97,19 @@ function worker(args)
                            mpd_state["{Date}"]   .. "\n"   ..
                            mpd_state["{Title}"],
                     icon = "/tmp/mpdcover.png",
                            mpd_state["{Date}"]   .. "\n"   ..
                            mpd_state["{Title}"],
                     icon = "/tmp/mpdcover.png",
-                    fg = beautiful.fg_focus or "#FFFFFF",
-                    bg = beautiful.bg_normal or "#000000" ,
-                    timeout = notify_timeout,
+                    fg = color,
+                    timeout = 6, 
                     replaces_id = mpd.id
                 }).id
             end
                     replaces_id = mpd.id
                 }).id
             end
-            mympd:set_markup(markup(color_artist, " " .. mpd_state["{Artist}"])
+            mympd:set_markup(markup(header_color, " " .. mpd_state["{Artist}"])
                              .. spr ..
                              .. spr ..
-                             markup(color_song, " " .. mpd_state["{Title}"] .. " "))
+                             markup(color, mpd_state["{Title}"] .. " "))
         elseif mpd_state["{state}"] == "pause"
         then
         elseif mpd_state["{state}"] == "pause"
         then
-            mympd:set_markup(markup(color_artist, " mpd")
+            mympd:set_markup(markup(header_color, " mpd")
                              .. spr ..
                              .. spr ..
-                             markup(color_song, " paused "))
+                             markup(color, "paused "))
         else
             helpers.set_map("current mpd track", nil)
                        set_nompd()
         else
             helpers.set_map("current mpd track", nil)
                        set_nompd()
@@ -126,7 +124,7 @@ function worker(args)
     mympd:buttons(awful.util.table.join(
         awful.button({}, 0,
             function()
     mympd:buttons(awful.util.table.join(
         awful.button({}, 0,
             function()
-                helpers.run_in_terminal(musicplr)
+                helpers.run_in_terminal(app)
             end)
     ))
 
             end)
     ))