sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Different static ways

Browse source
This commit is contained in:
Paul Fd 2020-03-16 00:28:57 +01:00
parent d27b7373fc
commit 67451024a5
2 changed files with 35 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/sfizz/Wavetables.cpp
View file

@ -275,11 +275,36 @@ void WavetableMulti::fillExtra()
WavetablePool::WavetablePool()
: waveSin(WavetableMulti::createForHarmonicProfile(HarmonicProfile::getSine(), config::amplitudeSine))
, waveTriangle(WavetableMulti::createForHarmonicProfile(HarmonicProfile::getTriangle(), config::amplitudeTriangle))
, waveSaw(WavetableMulti::createForHarmonicProfile(HarmonicProfile::getSaw(), config::amplitudeSaw))
, waveSquare(WavetableMulti::createForHarmonicProfile(HarmonicProfile::getSquare(), config::amplitudeSquare))
{ }
{
getWaveSin();
getWaveTriangle();
getWaveSaw();
getWaveSquare();
}
const WavetableMulti* WavetablePool::getWaveSin()
{
static auto wave = WavetableMulti::createForHarmonicProfile(
HarmonicProfile::getSine(), config::amplitudeSine);
return &wave;
}
const WavetableMulti* WavetablePool::getWaveTriangle()
{
static auto wave = WavetableMulti::createForHarmonicProfile(
HarmonicProfile::getTriangle(), config::amplitudeTriangle);
return &wave;
}
const WavetableMulti* WavetablePool::getWaveSaw()
{
static auto wave = WavetableMulti::createForHarmonicProfile(
HarmonicProfile::getSaw(), config::amplitudeSaw);
return &wave;
}
const WavetableMulti* WavetablePool::getWaveSquare()
{
static auto wave = WavetableMulti::createForHarmonicProfile(
HarmonicProfile::getSquare(), config::amplitudeSquare);
return &wave;
}
} // namespace sfz

18
src/sfizz/Wavetables.h
View file

@ -183,20 +183,12 @@ private:
* @brief Holds predefined wavetables.
*
*/
class WavetablePool {
public:
struct WavetablePool {
WavetablePool();
const WavetableMulti* getWaveSin() const { return &waveSin; }
const WavetableMulti* getWaveTriangle() const { return &waveTriangle; }
const WavetableMulti* getWaveSaw() const { return &waveSaw; }
const WavetableMulti* getWaveSquare() const { return &waveSquare; };
private:
const WavetableMulti waveSin;
const WavetableMulti waveTriangle;
const WavetableMulti waveSaw;
const WavetableMulti waveSquare;
LEAK_DETECTOR(WavetablePool);
static const WavetableMulti* getWaveSin();
static const WavetableMulti* getWaveTriangle();
static const WavetableMulti* getWaveSaw();
static const WavetableMulti* getWaveSquare();
};
} // namespace sfz