From 36c69246f1a19af2a0713a8d8c7ab59ad108736f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@tuta.io>
Date: Thu, 9 Jan 2020 20:31:31 +0100
Subject: Remove remaining redundant functions and use generic parseOptsWith
 instead

---
 src/Xmobar/Plugins/Monitors/MPD.hs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'src/Xmobar/Plugins/Monitors/MPD.hs')

diff --git a/src/Xmobar/Plugins/Monitors/MPD.hs b/src/Xmobar/Plugins/Monitors/MPD.hs
index cd08cda..3274c42 100644
--- a/src/Xmobar/Plugins/Monitors/MPD.hs
+++ b/src/Xmobar/Plugins/Monitors/MPD.hs
@@ -64,7 +64,7 @@ withMPD opts = M.withMPD_ (mHost opts) (mPort opts)
 
 runMPD :: [String] -> Monitor String
 runMPD args = do
-  opts <- io $ mopts args
+  opts <- io $ parseOptsWith options defaultOpts args
   status <- io $ withMPD opts M.status
   song <- io $ withMPD opts M.currentSong
   s <- parseMPD status song opts
@@ -79,7 +79,7 @@ mpdWait = do
 
 mpdReady :: [String] -> Monitor Bool
 mpdReady args = do
-  opts <- io $ mopts args
+  opts <- io $ parseOptsWith options defaultOpts args
   response <- io $ withMPD opts M.ping
   case response of
     Right _         -> return True
@@ -89,12 +89,6 @@ mpdReady args = do
     Left (M.ConnectionError _) -> return False
     Left _          -> return True
 
-mopts :: [String] -> IO MOpts
-mopts argv =
-  case getOpt Permute options argv of
-    (o, _, []) -> return $ foldr id defaultOpts o
-    (_, _, errs) -> ioError . userError $ concat errs
-
 parseMPD :: M.Response M.Status -> M.Response (Maybe M.Song) -> MOpts
             -> Monitor [String]
 parseMPD (Left e) _ _ = return $ show e:replicate 19 ""
-- 
cgit v1.2.3