Skip to content

Commit e588a6b

Browse files
authored
Support extensible-format WAVE files with PCM or IEEE sub-format for IRs (#567)
1 parent 6229d68 commit e588a6b

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

NeuralAmpModeler/NeuralAmpModeler.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,6 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info)
158158
const auto ngToggleArea =
159159
noiseGateArea.GetVShifted(noiseGateArea.H()).SubRectVertical(2, 0).GetReducedFromTop(10.0f);
160160
const auto eqToggleArea = midKnobArea.GetVShifted(midKnobArea.H()).SubRectVertical(2, 0).GetReducedFromTop(10.0f);
161-
const auto outNormToggleArea =
162-
outputKnobArea.GetVShifted(midKnobArea.H()).SubRectVertical(2, 0).GetReducedFromTop(10.0f);
163161

164162
// Areas for model and IR
165163
const auto fileWidth = 200.0f;
@@ -330,7 +328,7 @@ void NeuralAmpModeler::ProcessBlock(iplug::sample** inputs, iplug::sample** outp
330328
noiseGateActive ? mNoiseGateGain.Process(mOutputPointers, numChannelsInternal, numFrames) : mOutputPointers;
331329

332330
sample** toneStackOutPointers = (toneStackActive && mToneStack != nullptr)
333-
? mToneStack->Process(gateGainOutput, numChannelsInternal, numFrames)
331+
? mToneStack->Process(gateGainOutput, numChannelsInternal, nFrames)
334332
: gateGainOutput;
335333

336334
sample** irPointers = toneStackOutPointers;

NeuralAmpModeler/ToneStack.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ namespace tone_stack
1111
class AbstractToneStack
1212
{
1313
public:
14+
AbstractToneStack() = default;
15+
virtual ~AbstractToneStack() = default;
1416
// Compute in the real-time loop
1517
virtual DSP_SAMPLE** Process(DSP_SAMPLE** inputs, const int numChannels, const int numFrames) = 0;
1618
// Any preparation. Call from Reset() in the plugin
@@ -40,11 +42,10 @@ class BasicNamToneStack : public AbstractToneStack
4042
};
4143
~BasicNamToneStack() = default;
4244

43-
DSP_SAMPLE** Process(DSP_SAMPLE** inputs, const int numChannels, const int numFrames);
44-
virtual void Reset(const double sampleRate, const int maxBlockSize) override;
45+
DSP_SAMPLE** Process(DSP_SAMPLE** inputs, const int numChannels, const int numFrames) override;
46+
void Reset(const double sampleRate, const int maxBlockSize) override;
4547
// :param val: Assumed to be between 0 and 10, 5 is "noon"
46-
virtual void SetParam(const std::string name, const double val) override;
47-
48+
void SetParam(const std::string name, const double val) override;
4849

4950
protected:
5051
recursive_linear_filter::LowShelf mToneBass;

0 commit comments

Comments
 (0)