diff options
Diffstat (limited to 'src/Plugins/Monitors/MPD.hs')
| -rw-r--r-- | src/Plugins/Monitors/MPD.hs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Plugins/Monitors/MPD.hs b/src/Plugins/Monitors/MPD.hs index 3c1615e..1a49ad3 100644 --- a/src/Plugins/Monitors/MPD.hs +++ b/src/Plugins/Monitors/MPD.hs @@ -22,7 +22,7 @@ import Control.Concurrent (threadDelay) mpdConfig :: IO MConfig mpdConfig = mkMConfig "MPD: <state>" - [ "bar", "vbar", "dstr", "state", "statei", "volume", "length" + [ "bar", "vbar", "ipat", "state", "statei", "volume", "length" , "lapsed", "remaining", "plength", "ppos", "file" , "name", "artist", "composer", "performer" , "album", "title", "track", "genre" @@ -32,7 +32,7 @@ data MOpts = MOpts { mPlaying :: String , mStopped :: String , mPaused :: String - , mLapsedDynamicString :: Maybe DynamicString + , mLapsedIconPattern :: Maybe IconPattern } defaultOpts :: MOpts @@ -40,7 +40,7 @@ defaultOpts = MOpts { mPlaying = ">>" , mStopped = "><" , mPaused = "||" - , mLapsedDynamicString = Nothing + , mLapsedIconPattern = Nothing } options :: [OptDescr (MOpts -> MOpts)] @@ -48,8 +48,8 @@ options = [ Option "P" ["playing"] (ReqArg (\x o -> o { mPlaying = x }) "") "" , Option "S" ["stopped"] (ReqArg (\x o -> o { mStopped = x }) "") "" , Option "Z" ["paused"] (ReqArg (\x o -> o { mPaused = x }) "") "" - , Option "" ["lapsed-dynamic-string"] (ReqArg (\x o -> - o { mLapsedDynamicString = Just $ parseDynamicString x }) "") "" + , Option "" ["lapsed-icon-pattern"] (ReqArg (\x o -> + o { mLapsedIconPattern = Just $ parseIconPattern x }) "") "" ] runMPD :: [String] -> Monitor String @@ -91,8 +91,8 @@ parseMPD (Right st) song opts = do songData <- parseSong song bar <- showPercentBar (100 * b) b vbar <- showVerticalBar (100 * b) b - dstr <- showDynamicString (mLapsedDynamicString opts) b - return $ [bar, vbar, dstr, ss, si, vol, len, lap, remain, plen, ppos] ++ songData + ipat <- showIconPattern (mLapsedIconPattern opts) b + return $ [bar, vbar, ipat, ss, si, vol, len, lap, remain, plen, ppos] ++ songData where s = M.stState st ss = show s si = stateGlyph s opts |