diff options
| author | Sergei Trofimovich <slyfox@gentoo.org> | 2012-07-17 09:54:08 +0300 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2012-07-17 09:54:08 +0300 |
| commit | 9ec2025cba81c6568f1e5b66554fd94654f97e91 (patch) | |
| tree | 2f57ec80b0ff1e132139a8292a7e02db57f831fd | |
| parent | 70176bb674b70fbfa4bccc58824bdfb72f7f22db (diff) | |
| download | xmobar-9ec2025cba81c6568f1e5b66554fd94654f97e91.tar.gz xmobar-9ec2025cba81c6568f1e5b66554fd94654f97e91.tar.bz2 | |
xmobar.cabal: port to libmpd-0.8.
Now all values are returned as 'Value' wrapped entries.
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
| -rw-r--r-- | src/Plugins/Monitors/MPD.hs | 4 | ||||
| -rw-r--r-- | xmobar.cabal | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Plugins/Monitors/MPD.hs b/src/Plugins/Monitors/MPD.hs index cc40a56..e56260d 100644 --- a/src/Plugins/Monitors/MPD.hs +++ b/src/Plugins/Monitors/MPD.hs @@ -91,10 +91,10 @@ parseSong (Right Nothing) = return $ repeat "" parseSong (Right (Just s)) = let join [] = "" join (x:xs) = foldl (\a o -> a ++ ", " ++ o) x xs - str sel = maybe "" join (M.sgGetTag sel s) + str sel = maybe "" (join . map M.toString) (M.sgGetTag sel s) sels = [ M.Name, M.Artist, M.Composer, M.Performer , M.Album, M.Title, M.Track, M.Genre ] - fields = M.sgFilePath s : map str sels + fields = M.toString (M.sgFilePath s) : map str sels in mapM showWithPadding fields showTime :: Integer -> String diff --git a/xmobar.cabal b/xmobar.cabal index 3b235bb..e0cd4eb 100644 --- a/xmobar.cabal +++ b/xmobar.cabal @@ -146,7 +146,7 @@ executable xmobar cpp-options: -DIWLIB if flag(with_mpd) || flag(all_extensions) - build-depends: libmpd == 0.7.* + build-depends: libmpd >= 0.8 && < 0.9 other-modules: Plugins.Monitors.MPD cpp-options: -DLIBMPD |