Fix unintended renaming

pull/1/head
Darrell Anderson 11 years ago
parent 59c8265265
commit a2971722db

@ -440,12 +440,12 @@ void HSPPostProcessor::scopeify(unsigned long time, unsigned char *data, size_t
void HSPPostProcessor::updateEQgains(int pamp, vector<int> &equalizerGains) void HSPPostProcessor::updateEQgains(int pamp, vector<int> &equalizerGains)
{ {
for (int i=0; i<ETQ_CHANNELS; i++) for (int i=0; i<EQ_CHANNELS; i++)
{ {
preamp[i] = (float) pamp * 0.01; preamp[i] = (float) pamp * 0.01;
for (int j=0; j<ETQ_MAX_BANDS; j++) for (int j=0; j<EQ_MAX_BANDS; j++)
gain[j][i] = (float)(equalizerGains[j]) * 0.012 - 0.2; gain[j][i] = (float)(equalizerGains[j]) * 0.012 - 0.2;
} }
} }
@ -455,7 +455,7 @@ void HSPPostProcessor::equalize(unsigned char *inbuf, unsigned char *outbuf, siz
{ {
int index, band, channel; int index, band, channel;
int tempint, halflength; int tempint, halflength;
float out[ETQ_CHANNELS], pcm[ETQ_CHANNELS]; float out[EQ_CHANNELS], pcm[EQ_CHANNELS];
short int *data = (short int *) inbuf; short int *data = (short int *) inbuf;
short int *dataout = (short int *) outbuf; short int *dataout = (short int *) outbuf;

@ -68,8 +68,8 @@ private:
#define BAND_NUM 10 #define BAND_NUM 10
#define ETQ_MAX_BANDS 10 #define EQ_MAX_BANDS 10
#define ETQ_CHANNELS 2 // Helix DNA currently only supports stereo #define EQ_CHANNELS 2 // Helix DNA currently only supports stereo
// Floating point // Floating point
typedef struct typedef struct
@ -149,13 +149,13 @@ private:
// Gain for each band // Gain for each band
// values should be between -0.2 and 1.0 // values should be between -0.2 and 1.0
float gain[ETQ_MAX_BANDS][ETQ_CHANNELS] __attribute__((aligned)); float gain[EQ_MAX_BANDS][EQ_CHANNELS] __attribute__((aligned));
// Volume gain // Volume gain
// values should be between 0.0 and 1.0 // values should be between 0.0 and 1.0
float preamp[ETQ_CHANNELS] __attribute__((aligned)); float preamp[EQ_CHANNELS] __attribute__((aligned));
// Coefficients // Coefficients
sIIRCoefficients* iir_cf; sIIRCoefficients* iir_cf;
sXYData data_history[ETQ_MAX_BANDS][ETQ_CHANNELS] __attribute__((aligned)); sXYData data_history[EQ_MAX_BANDS][EQ_CHANNELS] __attribute__((aligned));
// history indices // history indices
int m_i; int m_i;
int m_j; int m_j;

Loading…
Cancel
Save