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.

5 files changed, 9 insertions, 10 deletions

diff --git a/extern/audaspace/src/fx/DynamicMusic.cpp b/extern/audaspace/src/fx/DynamicMusic.cpp
index 2b0acc06fbc..c682108378f 100644
--- a/extern/audaspace/src/fx/DynamicMusic.cpp
+++ b/extern/audaspace/src/fx/DynamicMusic.cpp
@@ -15,9 +15,6 @@
 ******************************************************************************/
 
 #include "fx/DynamicMusic.h"
-#include "generator/Silence.h"
-#include "fx/Fader.h"
-#include "fx/Limiter.h"
 
 #include <mutex>
 #include <condition_variable>
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
diff --git a/extern/audaspace/src/generator/Silence.cpp b/extern/audaspace/src/generator/Silence.cpp
index a173a1bc5f6..2919f892803 100644
--- a/extern/audaspace/src/generator/Silence.cpp
+++ b/extern/audaspace/src/generator/Silence.cpp
@@ -19,13 +19,14 @@
 
 AUD_NAMESPACE_BEGIN
 
-Silence::Silence()
+Silence::Silence(SampleRate sampleRate) :
+	m_sampleRate(sampleRate)
 {
 }
 
 std::shared_ptr<IReader> Silence::createReader()
 {
-	return std::shared_ptr<IReader>(new SilenceReader());
+	return std::shared_ptr<IReader>(new SilenceReader(m_sampleRate));
 }
 
 AUD_NAMESPACE_END
diff --git a/extern/audaspace/src/generator/SilenceReader.cpp b/extern/audaspace/src/generator/SilenceReader.cpp
index 39358cc087a..746cc7600da 100644
--- a/extern/audaspace/src/generator/SilenceReader.cpp
+++ b/extern/audaspace/src/generator/SilenceReader.cpp
@@ -20,8 +20,9 @@
 
 AUD_NAMESPACE_BEGIN
 
-SilenceReader::SilenceReader() :
-	m_position(0)
+SilenceReader::SilenceReader(SampleRate sampleRate) :
+	m_position(0),
+	m_sampleRate(sampleRate)
 {
 }
 
@@ -48,7 +49,7 @@ int SilenceReader::getPosition() const
 Specs SilenceReader::getSpecs() const
 {
 	Specs specs;
-	specs.rate = RATE_48000;
+	specs.rate = m_sampleRate;
 	specs.channels = CHANNELS_MONO;
 	return specs;
 }
diff --git a/extern/audaspace/src/sequence/SuperposeReader.cpp b/extern/audaspace/src/sequence/SuperposeReader.cpp
index 9206a7a96ef..a65185acf17 100644
--- a/extern/audaspace/src/sequence/SuperposeReader.cpp
+++ b/extern/audaspace/src/sequence/SuperposeReader.cpp
@@ -48,7 +48,7 @@ int SuperposeReader::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 SuperposeReader::getPosition() const