dobutokO2 0.24.1.0 → 0.24.2.0

raw patch · 4 files changed

+22/−13 lines, 4 files

Files

• CHANGELOG.md +4/−0
• DobutokO/Sound.hs +10/−5
• DobutokO/Sound/Functional.hs +7/−7
• dobutokO2.cabal +1/−1

@@ -224,3 +224,7 @@  * Twenty-fourth version revised A. Fixed issue with being not compiled because of the mapM_ applied for list and not vector for GHC 7.8.4. Some code and documentation improvements. ++## 0.24.2.0 -- 2020-04-06++* Twenty-fourth version revised B. Fixed issue with overwritten "result.wav" file in some functions. Now the program works as expected for these functions. Some minor documentation improvements. 

@@ -327,7 +327,8 @@           soxSynthHelpMain note0 note1           overSoXSynthHelpN v0           overSoXSynthHelpN2 v1-          mixTest) vec0+          mixTest+          renameFile "result.wav" $ "result" ++ prependZeroes zeroN (show j) ++ ".wav") vec0  | otherwise = let ampL1 = ampL - (fromIntegral . truncate $ ampL) in     if abs ampL1 < 0.01 then overSoXSynthN n 0.01 time3 zs vec0     else overSoXSynthN n ampL1 time3 zs vec0@@ -360,7 +361,8 @@           soxSynthHelpMain note0 note1           overSoXSynthHelpN v0           overSoXSynthHelpN2 v1-          mixTest) vec0+          mixTest+          renameFile "result.wav" $ "result" ++ prependZeroes zeroN (show j) ++ ".wav") vec0  | otherwise = let ampL1 = ampL - (fromIntegral . truncate $ ampL) in     if abs ampL1 < 0.01 then overSoXSynthN2 n 0.01 time3 zs tts vec0     else overSoXSynthN2 n ampL1 time3 zs tts vec0    @@ -568,7 +570,8 @@           soxSynthHelpMain note0 note1           uniqOverSoXSynthHelpN v0           uniqOverSoXSynthHelpN2 v1-          mixTest) vec0+          mixTest+          renameFile "result.wav" $ "result" ++ prependZeroes zeroN (show j) ++ ".wav") vec0  | otherwise = let ampL1 = ampL - (fromIntegral . truncate $ ampL) in     if abs ampL1 < 0.01 then uniqOverSoXSynthN n 0.01 time3 zs wws vec0     else uniqOverSoXSynthN n ampL1 time3 zs wws vec0@@ -605,7 +608,8 @@           soxSynthHelpMain note0 note1           uniqOverSoXSynthHelpN v0           uniqOverSoXSynthHelpN2 v1-          mixTest) vec0+          mixTest+          renameFile "result.wav" $ "result" ++ prependZeroes zeroN (show j) ++ ".wav") vec0  | otherwise = let ampL1 = ampL - (fromIntegral . truncate $ ampL) in     if abs ampL1 < 0.01 then uniqOverSoXSynthN3 n 0.01 time3 zs wws tts vec0     else uniqOverSoXSynthN3 n ampL1 time3 zs wws tts vec0    @@ -656,7 +660,8 @@                   ; soxSynthHelpMain1 (fromJust note1)                   ; uniqOverSoXSynthHelpN v0                   ; uniqOverSoXSynthHelpN2 v1}-          mixTest) vec0+          mixTest+          renameFile "result.wav" $ "result" ++ prependZeroes zeroN (show j) ++ ".wav") vec0  | otherwise = let ampL1 = ampL - (fromIntegral . truncate $ ampL) in     if abs ampL1 < 0.01 then uniqOverSoXSynthN4 n 0.01 time3 dAmpl zs wws tts vs vec0     else uniqOverSoXSynthN4 n ampL1 time3 dAmpl zs wws tts vs vec0    

@@ -94,7 +94,7 @@   , doubleVecFromVecOfDouble   , helpF1   , helpF0-  -- * Working with 'ObertonesO' and function f+  -- * Working with 'OvertonesO' and function f   , maybeFFromStrVec   , fVecCoefs   , showFFromStrVec@@ -247,8 +247,8 @@  -- | Combines (mixes) all \"test\*" files in the given directory. The files should be similar in parameters and must be sound files for SoX to work -- on them properly. Afterwards, the function deletes these combined files.-mixTest :: IO ()-mixTest = do+mixTest :: Int -> Int -> IO ()+mixTest zeroN j = do   paths0 <- listDirectory "."   let paths = sort . filter (isPrefixOf "test") $ paths0   _ <- readProcessWithExitCode (fromJust (showE "sox")) (["--combine", "mix"] ++ paths ++ ["result.wav","vol","0.3"]) ""@@ -256,12 +256,12 @@  -- | Similar to 'mixTest', but allows to change the sound quality parameters for the resulting file. For more information, please, refer to -- 'soxBasicParams'.-mixTest2G :: String -> IO ()-mixTest2G ys = do+mixTest2G :: Int -> Int -> String -> IO ()+mixTest2G zeroN j ys = do   paths0 <- listDirectory "."   let paths = sort . filter (isPrefixOf "test") $ paths0   _ <- readProcessWithExitCode (fromJust (showE "sox")) (["--combine", "mix"] ++ paths ++ soxBasicParams ys ["result.wav","vol","0.3"]) ""-  mapM_ removeFile paths  +  mapM_ removeFile paths  -- | Gets an \"end.wav\" file from the intermediate \"result\*.wav\" files in the current directory. If it is not successful, produces the notification -- message and exits without error. If you would like to create the file if there are too many intermediate ones, please, run@@ -925,7 +925,7 @@  ----------------------------------------------------------------------------------- --- | Gets a function @f::Double -> ObertonesO@ that can be used further. Has two variants with usage of 'closestNote' ('Int' argument is greater than 0)+-- | Gets a function @f::Double -> OvertonesO@ that can be used further. Has two variants with usage of 'closestNote' ('Int' argument is greater than 0)v --  and without it ('Int' argument is less than 0). For both cases 'String' must be in a form list of tuples of pairs of 'Double' to get somewhat -- reasonable result. The function @f@ can be shown using a special printing function 'showFFromStrVec'. It is a simplest multiplicative (somewhat -- acoustically and musically reasonable) form for the function that can provide such a result that fits into the given data.

@@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/  name:                dobutokO2-version:             0.24.1.0+version:             0.24.2.0 synopsis:            A program and a library to create experimental music from a mono audio and a Ukrainian text description:         It can also create a timbre for the notes. Uses SoX inside. homepage:            https://hackage.haskell.org/package/dobutokO2