diff options
| author | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2012-07-19 22:10:50 +0200 |
|---|---|---|
| committer | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2012-07-19 22:10:50 +0200 |
| commit | bbaba37197a2d2c975abb5bbef350bba71cbb526 (patch) | |
| tree | e028f4d56a3c74d21d81548ccf7fe0f0af241fb8 | |
| parent | dd305fbe5303f7fd306bbc0828996df1ac55c9b4 (diff) | |
| parent | 9ec2025cba81c6568f1e5b66554fd94654f97e91 (diff) | |
| download | xmobar-bbaba37197a2d2c975abb5bbef350bba71cbb526.tar.gz xmobar-bbaba37197a2d2c975abb5bbef350bba71cbb526.tar.bz2 | |
Merge remote-tracking branch 'trofi/master'
| -rw-r--r-- | src/Plugins/Monitors/MPD.hs | 4 | ||||
| -rw-r--r-- | xmobar.cabal | 6 |
2 files changed, 5 insertions, 5 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 71ea524..e0cd4eb 100644 --- a/xmobar.cabal +++ b/xmobar.cabal @@ -112,9 +112,9 @@ executable xmobar time, filepath, X11 == 1.6.*, - mtl == 2.0.*, + mtl >= 2.0 && < 2.2, parsec == 3.1.*, - stm == 2.3.* + stm >= 2.3 && <2.5 if flag(small_base) build-depends: @@ -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 |