diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -80,3 +80,8 @@ ## 0.6.1.0 -- 2020-05-30 * Sixth version revised A. Fixed issue with being not compiled because of the syntaxis. + +## 0.7.0.0 -- 2020-06-24 + +* Seventh version. Changed Double to Float in the MMSyn7l module so that the functons can be consistent with new dobutokO packages. Besides, the double precision +is not needed and in some cases is meaningless and can potentially (a little bit, however) reduce performance in some cases. Some minor code and documentation improvements. diff --git a/MMSyn7l.hs b/MMSyn7l.hs --- a/MMSyn7l.hs +++ b/MMSyn7l.hs @@ -124,7 +124,7 @@ else changeVol4 file (change0, originalStr) -- | Function 'changeVol2' is used internally in the 'specifyVol' in case of decreasing of the sound. -changeVol2 :: FilePath -> String -> Double -> IO () +changeVol2 :: FilePath -> String -> Float -> IO () changeVol2 file xs ampl = do let ys = take 4 . filter isDigit $ xs coefA = 0.0001 * fromIntegral (read ys::Int) @@ -134,7 +134,7 @@ -- | Function 'changeVol3' is used internally in the 'specifyVol' in case of working with the maximum amplitude. changeVol3 :: FilePath -> (String, String) -> IO () changeVol3 file (change0, originalStr) = do - let ampl = read originalStr::Double + let ampl = read originalStr::Float if ampl > 0.0 then do let delta = 1.0 - ampl @@ -151,7 +151,7 @@ -- | Function 'changeVol4' is used internally in the 'specifyVol' in case of working with the minimum amplitude. changeVol4 :: FilePath -> (String, String) -> IO () changeVol4 file (change0, originalStr) = do - let ampl = read originalStr::Double + let ampl = read originalStr::Float if ampl < 0.0 then do let delta = (-1.0) - ampl @@ -227,9 +227,9 @@ fadeEndsMilN n file = soxE file ["fade","q", showFFloat (Just 4) (if (n `rem` 11) /= 0 then 0.001 * fromIntegral (n `rem` 11) else 0.002) "","-0.0"] -- | Applies \"fade\" effect (the type is specified by the 'Char' argument, for more information, please, refer to the SoX documentation) to the both ends --- of the sound with header (supported by SoX). The 'Double' arguments specify the percentages of the length of the sound that is faded-in and faded-out +-- of the sound with header (supported by SoX). The 'Float' arguments specify the percentages of the length of the sound that is faded-in and faded-out -- respectively. Otherwise, the function returns an error. -fadeEndsTMN :: Char -> Double -> Double -> FilePath -> IO () +fadeEndsTMN :: Char -> Float -> Float -> FilePath -> IO () fadeEndsTMN c per1 per2 file | compare per1 0 == GT && compare per2 0 == GT && compare (per1 + per2) 100 /= GT = do d0 <- SB.durationA file @@ -237,9 +237,9 @@ showFFloat (Just 4) (d0 * per2 / 100.0) ""] | otherwise = error "MMSyn7l.fadeEndsTMN: the percentages sum is out of the (0..100] range. " --- | Variant of the 'fadeEndsTMN' with the both equal percentages specified by the 'Double' argument. It must be in the range (0..50]. Otherwise, the function +-- | Variant of the 'fadeEndsTMN' with the both equal percentages specified by the 'Float' argument. It must be in the range (0..50]. Otherwise, the function -- returns error. -fadeEndsTMB :: Char -> Double -> FilePath -> IO () +fadeEndsTMB :: Char -> Float -> FilePath -> IO () fadeEndsTMB c per | compare per 0 == GT && compare per 50 /= GT = fadeEndsTMN c per per | otherwise = error "MMSyn7l.fadeEndsTMB: the percentage is out of the (0..50] range. " diff --git a/README.markdown b/README.markdown --- a/README.markdown +++ b/README.markdown @@ -1,5 +1,5 @@ ***** Usage Notes ***** - ----------------------- + ======================= For the proper proceeding you specify a String, which consists of 4 digits (and it may be preceded by a symbol "-"). If the String @@ -33,7 +33,7 @@ and so on. ***** Command Line Arguments ***** - ---------------------------------- + ================================== If you specify a command line argument (other than "-h", "-r", or "-v"), it must be a sorted list of the Ukrainian sounds representations, @@ -55,7 +55,7 @@ the last files to be adjusted. ***** Library Functions to Edit Sound ***** - ------------------------------------------- + =========================================== Since the 0.5.0.0 version from DobutokO.Sound.IntermediateF module (dobutokO2 package) some functions were moved here. They are in MMSyn7l module. This was done to allow diff --git a/mmsyn7l.cabal b/mmsyn7l.cabal --- a/mmsyn7l.cabal +++ b/mmsyn7l.cabal @@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/ name: mmsyn7l -version: 0.6.1.0 +version: 0.7.0.0 synopsis: Modifies the amplitudes of the Ukrainian sounds representations created by mmsyn7ukr package. description: A program and a library to modify the amplitudes of the Ukrainian sounds representations created by mmsyn7ukr package or somehow otherwise. homepage: https://hackage.haskell.org/package/mmsyn7l @@ -20,7 +20,7 @@ exposed-modules: Main, MMSyn7l -- other-modules: -- other-extensions: - build-depends: base >=4.7 && <4.15, mmsyn7ukr >=0.15.4 && <1, vector >=0.11 && <0.14, mmsyn2 >=0.1.8 && <1, directory >=1.2.7 && <2, process >=1.4 && <1.9, mmsyn3 >=0.1.5 && <1 + build-depends: base >=4.7 && <4.15, mmsyn7ukr >=0.16 && <1, vector >=0.11 && <0.14, mmsyn2 >=0.1.8 && <1, directory >=1.2.7 && <2, process >=1.4 && <1.9, mmsyn3 >=0.1.5 && <1 -- hs-source-dirs: default-language: Haskell2010 @@ -28,6 +28,6 @@ main-is: Main.hs -- other-modules: -- other-extensions: - build-depends: base >=4.7 && <4.15, mmsyn7ukr >=0.15.4 && <1, vector >=0.11 && <0.14, mmsyn2 >=0.1.8 && <1, directory >=1.2.7 && <2, process >=1.4 && <1.9, mmsyn3 >=0.1.5 && <1 + build-depends: base >=4.7 && <4.15, mmsyn7ukr >=0.16 && <1, vector >=0.11 && <0.14, mmsyn2 >=0.1.8 && <1, directory >=1.2.7 && <2, process >=1.4 && <1.9, mmsyn3 >=0.1.5 && <1 -- hs-source-dirs: default-language: Haskell2010