From 779bc598aa5f33e74cae5d6f5d28aab7f49b5c85 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Wed, 25 Nov 2020 17:15:46 +0000
Subject: More consistent argument order for MPDX

---
 readme.md                      | 4 ++--
 src/Xmobar/Plugins/Monitors.hs | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/readme.md b/readme.md
index 0720636..8f820be 100644
--- a/readme.md
+++ b/readme.md
@@ -1321,9 +1321,9 @@ following differences:
                  "--", "-P", ">>", "-Z", "|", "-S", "><"] 10
     ```
 
-## `MPDX Alias Args RefreshRate`
+## `MPDX Args RefreshRate Alias`
 
-Like `MPD` but uses as alias its first argument instead of "mpd".
+Like `MPD` but uses as alias its last argument instead of "mpd".
 
 ## `Mpris1 PlayerName Args RefreshRate`
 
diff --git a/src/Xmobar/Plugins/Monitors.hs b/src/Xmobar/Plugins/Monitors.hs
index cca0948..594065c 100644
--- a/src/Xmobar/Plugins/Monitors.hs
+++ b/src/Xmobar/Plugins/Monitors.hs
@@ -90,7 +90,7 @@ data Monitors = Network      Interface   Args Rate
 #endif
 #ifdef LIBMPD
               | MPD Args Rate
-              | MPDX String Args Rate
+              | MPDX Args Rate Alias
               | AutoMPD  Args
 #endif
 #ifdef ALSA
@@ -149,7 +149,7 @@ instance Exec Monitors where
 #ifdef LIBMPD
     alias (MPD _ _) = "mpd"
     alias (AutoMPD _) = "autompd"
-    alias (MPDX a _ _) = a
+    alias (MPDX _ _ a) = a
 #endif
 #ifdef ALSA
     alias (Volume m c _ _) = m ++ ":" ++ c
@@ -193,7 +193,7 @@ instance Exec Monitors where
 #endif
 #ifdef LIBMPD
     start (MPD a r) = runMD a mpdConfig runMPD r mpdReady
-    start (MPDX _ a r) = start (MPD a r)
+    start (MPDX a r _) = start (MPD a r)
     start (AutoMPD a) = runMBD a mpdConfig runMPD mpdWait mpdReady
 #endif
 #ifdef ALSA
-- 
cgit v1.2.3