diff options
| author | Jörg Müller <nexyon@gmail.com> | 2019-05-11 00:01:04 +0300 |
|---|---|---|
| committer | Jörg Müller <nexyon@gmail.com> | 2019-05-11 00:01:04 +0300 |
| commit | 8096f36796ae07a1a76e99abbaf216ab29260b74 (patch) | |
| tree | 64ad4a670f2ea9c44d783cba2b474b0eee320e3a /extern/audaspace/src/fx/ModulatorReader.cpp | |
| parent | 243fbf1c4bacf82dd30dc9068ac634343d5b6ad6 (diff) | |
Audaspace: porting changes from upstream.
- Silence now has an optional sample rate parameter.
- Fix: wrong length reported by modulator and superpose.
- Minor formatting, include and documentation fixes.
Diffstat (limited to 'extern/audaspace/src/fx/ModulatorReader.cpp')
| -rw-r--r-- | extern/audaspace/src/fx/ModulatorReader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/audaspace/src/fx/ModulatorReader.cpp b/extern/audaspace/src/fx/ModulatorReader.cpp index c17cee08239..f7cdc1d2758 100644 --- a/extern/audaspace/src/fx/ModulatorReader.cpp +++ b/extern/audaspace/src/fx/ModulatorReader.cpp @@ -48,7 +48,7 @@ int ModulatorReader::getLength() const int len2 = m_reader2->getLength(); if((len1 < 0) || (len2 < 0)) return -1; - return std::min(len1, len2); + return std::max(len1, len2); } int ModulatorReader::getPosition() const |