summaryrefslogtreecommitdiffhomepage
path: root/src/Xmobar/Plugins/Monitors/Alsa.hs
diff options
context:
space:
mode:
authorjao <jao@gnu.org>2018-11-21 22:58:07 +0000
committerjao <jao@gnu.org>2018-11-21 22:58:07 +0000
commit0c5f9ddc26e2f581a79f0a32c29f97a0a9ed35b5 (patch)
tree1f04bfccb6bb586e9dec6288247218cc806f9aff /src/Xmobar/Plugins/Monitors/Alsa.hs
parentc14440b575e311a2995ff00ff22a995b9b43c5fa (diff)
downloadxmobar-0c5f9ddc26e2f581a79f0a32c29f97a0a9ed35b5.tar.gz
xmobar-0c5f9ddc26e2f581a79f0a32c29f97a0a9ed35b5.tar.bz2
Cabal file adapted to the library split
Diffstat (limited to 'src/Xmobar/Plugins/Monitors/Alsa.hs')
-rw-r--r--src/Xmobar/Plugins/Monitors/Alsa.hs9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/Xmobar/Plugins/Monitors/Alsa.hs b/src/Xmobar/Plugins/Monitors/Alsa.hs
index c231303..21a2786 100644
--- a/src/Xmobar/Plugins/Monitors/Alsa.hs
+++ b/src/Xmobar/Plugins/Monitors/Alsa.hs
@@ -24,8 +24,7 @@ import Control.Concurrent.Async
import Control.Exception
import Control.Monad
import Xmobar.Plugins.Monitors.Common
-import Xmobar.Plugins.Monitors.Volume(volumeConfig, VolumeOpts, runVolumeWith)
-import qualified Plugins.Monitors.Volume as Volume;
+import qualified Xmobar.Plugins.Monitors.Volume as Volume;
import System.Console.GetOpt
import System.Directory
import System.Exit
@@ -33,7 +32,7 @@ import System.IO
import System.Process
data AlsaOpts = AlsaOpts
- { aoVolumeOpts :: VolumeOpts
+ { aoVolumeOpts :: Volume.VolumeOpts
, aoAlsaCtlPath :: Maybe FilePath
}
@@ -75,10 +74,10 @@ startAlsaPlugin mixerName controlName args cb = do
-- it, which probably isn't going to happen with the default
-- optimization settings).
opts2 <- io $ parseOpts args2
- runVolumeWith (aoVolumeOpts opts2) mixerName controlName
+ Volume.runVolumeWith (aoVolumeOpts opts2) mixerName controlName
withMonitorWaiter mixerName (aoAlsaCtlPath opts) $ \wait_ ->
- runMB args volumeConfig run wait_ cb
+ runMB args Volume.volumeConfig run wait_ cb
withMonitorWaiter :: String -> Maybe FilePath -> (IO () -> IO a) -> IO a
withMonitorWaiter mixerName alsaCtlPath cont = do