Refined Adjustable Level instance

3 files changed, 19 insertions, 7 deletions

diff --git a/src/Trivmix/Types.hs b/src/Trivmix/Types.hs
index 66accdf..01418bf 100644
--- a/src/Trivmix/Types.hs
+++ b/src/Trivmix/Types.hs
@@ -43,18 +43,24 @@ withType f = f undefined
 withResolution :: (HasResolution a) => (Integer -> f a) -> f a
 withResolution f = withType (f . resolution)
 
+linToDb :: Float -> Float
+linToDb x = 10 ** (0.05 * x)
+
+dBToLin :: Float -> Float
+dBToLin x = 20 * (logBase 10 x)
+
 instance Show Level where
   show (Lin x) = show x
   show (DB x) = (show $ (withPrec x' :: Milli)) ++ "dB"
     where
-      x' = 20 * (logBase 10 x)
+      x' = dBToLin x
 
 instance Read Level where
   readsPrec i = map toL . readsPrec i
     where
       toL :: (Float, String) -> (Level, String)
       toL (f, str)
-        | ((==) `on` CI.mk) prec unit = (DB $ 10 ** (0.05 * f), rest)
+        | ((==) `on` CI.mk) prec unit = (DB $ linToDb f, rest)
         | otherwise = (Lin f, str)
         where
           prec = take lU str
@@ -80,9 +86,15 @@ class Adjustable a where
   add :: a -> a -> a
   sub :: a -> a -> a
 
-instance Num a => Adjustable a where
-  add = (+)
-  sub = (-)
+-- instance Num a => Adjustable a where
+--   add = (+)
+--   sub = (-)
+
+instance Adjustable Level where
+  add (DB x) (DB y) = DB $ ((+) `on` linToDb) x y
+  add x y = x + y
+  sub (DB x) (DB y) = DB $ ((-) `on` linToDb) x y
+  sub x y = x - y
 
 doAdjustment :: Adjustable a => a -> Adjustment a -> a
 doAdjustment _ (Set y) = y
diff --git a/trivmix.cabal b/trivmix.cabal
index 533ef30..803c640 100644
--- a/trivmix.cabal
+++ b/trivmix.cabal
@@ -2,7 +2,7 @@
 -- documentation, see http://haskell.org/cabal/users-guide/
 
 name:                trivmix
-version:             2.5.1
+version:             2.5.2
 -- synopsis:            
 -- description:         
 license:             PublicDomain
diff --git a/trivmix.nix b/trivmix.nix
index 5ef76b0..298174b 100644
--- a/trivmix.nix
+++ b/trivmix.nix
@@ -6,7 +6,7 @@
 
 cabal.mkDerivation (self: {
   pname = "trivmix";
-  version = "2.5.1";
+  version = "2.5.2";
   src = ./.;
   isLibrary = true;
   isExecutable = true;