diff options
Diffstat (limited to 'audio/softsynth/mt32/Partial.cpp')
| -rwxr-xr-x[-rw-r--r--] | audio/softsynth/mt32/Partial.cpp | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/audio/softsynth/mt32/Partial.cpp b/audio/softsynth/mt32/Partial.cpp index 7348087509..6afef364df 100644..100755 --- a/audio/softsynth/mt32/Partial.cpp +++ b/audio/softsynth/mt32/Partial.cpp @@ -1,5 +1,5 @@ /* Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009 Dean Beeler, Jerome Fisher - * Copyright (C) 2011, 2012, 2013, 2014 Dean Beeler, Jerome Fisher, Sergey V. Mikayev + * Copyright (C) 2011-2016 Dean Beeler, Jerome Fisher, Sergey V. Mikayev * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -15,14 +15,19 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -//#include <cmath> -//#include <cstdlib> -//#include <cstring> +#include <cstddef> -#include "mt32emu.h" -#include "mmath.h" #include "internals.h" +#include "Partial.h" +#include "Part.h" +#include "Poly.h" +#include "Synth.h" +#include "Tables.h" +#include "TVA.h" +#include "TVF.h" +#include "TVP.h" + namespace MT32Emu { static const Bit8u PAN_NUMERATOR_MASTER[] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7}; @@ -54,7 +59,7 @@ int Partial::debugGetPartialNum() const { } // Only used for debugging purposes -unsigned long Partial::debugGetSampleNum() const { +Bit32u Partial::debugGetSampleNum() const { return sampleNum; } @@ -266,7 +271,7 @@ void Partial::backupCache(const PatchCache &cache) { } } -bool Partial::produceOutput(Sample *leftBuf, Sample *rightBuf, unsigned long length) { +bool Partial::produceOutput(Sample *leftBuf, Sample *rightBuf, Bit32u length) { if (!isActive() || alreadyOutputed || isRingModulatingSlave()) { return false; } @@ -313,8 +318,8 @@ bool Partial::produceOutput(Sample *leftBuf, Sample *rightBuf, unsigned long len // Though, it is unknown whether this overflow is exploited somewhere. Sample leftOut = Sample((sample * leftPanValue) >> 8); Sample rightOut = Sample((sample * rightPanValue) >> 8); - *leftBuf = Synth::clipSampleEx((SampleEx)*leftBuf + (SampleEx)leftOut); - *rightBuf = Synth::clipSampleEx((SampleEx)*rightBuf + (SampleEx)rightOut); + *leftBuf = Synth::clipSampleEx(SampleEx(*leftBuf) + SampleEx(leftOut)); + *rightBuf = Synth::clipSampleEx(SampleEx(*rightBuf) + SampleEx(rightOut)); leftBuf++; rightBuf++; #endif @@ -341,4 +346,4 @@ void Partial::startDecayAll() { tvf->startDecay(); } -} +} // namespace MT32Emu |