diff options
| author | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2012-07-21 18:27:35 +0200 |
|---|---|---|
| committer | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2012-07-21 18:27:35 +0200 |
| commit | 7c38acde5da92181b3f1da44fdd52bb732d145e9 (patch) | |
| tree | 9878efa0270504816a9cfed18d6cc2ac443b7a6b /src/Plugins/Monitors.hs | |
| parent | f24d03d994c59dd9d91fd280272254eeb6a03b19 (diff) | |
| parent | 0f8e3e7cf4afb28a9ed8c1922f8090c67d4714f1 (diff) | |
| download | xmobar-7c38acde5da92181b3f1da44fdd52bb732d145e9.tar.gz xmobar-7c38acde5da92181b3f1da44fdd52bb732d145e9.tar.bz2 | |
Merge remote-tracking branch 'math/dev/mpd-idle' into mpd
Conflicts:
xmobar.cabal
Diffstat (limited to 'src/Plugins/Monitors.hs')
| -rw-r--r-- | src/Plugins/Monitors.hs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Plugins/Monitors.hs b/src/Plugins/Monitors.hs index 9f17699..a531e26 100644 --- a/src/Plugins/Monitors.hs +++ b/src/Plugins/Monitors.hs @@ -19,7 +19,7 @@ module Plugins.Monitors where import Plugins -import Plugins.Monitors.Common ( runM ) +import Plugins.Monitors.Common ( runM, runMB ) import Plugins.Monitors.Weather import Plugins.Monitors.Net import Plugins.Monitors.Mem @@ -71,6 +71,7 @@ data Monitors = Weather Station Args Rate #endif #ifdef LIBMPD | MPD Args Rate + | AutoMPD Args #endif #ifdef ALSA | Volume String String Args Rate @@ -115,6 +116,7 @@ instance Exec Monitors where #endif #ifdef LIBMPD alias (MPD _ _) = "mpd" + alias (AutoMPD _) = "autompd" #endif #ifdef ALSA alias (Volume m c _ _) = m ++ ":" ++ c @@ -147,6 +149,7 @@ instance Exec Monitors where #endif #ifdef LIBMPD start (MPD a r) = runM a mpdConfig runMPD r + start (AutoMPD a) = runMB a mpdConfig runMPD mpdWait #endif #ifdef ALSA start (Volume m c a r) = runM a volumeConfig (runVolume m c) r |