diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2014-02-16 12:16:01 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2014-02-16 12:16:01 -0600 |
| commit | a2971722db2e991a2aa07f6f9002377f7f99c93d (patch) | |
| tree | e4005c07948128fd19a86c64f9aad76bb0b585ab | |
| parent | 59c82652650c65ffa74c7373c4cddaa9c3184567 (diff) | |
| download | amarok-a2971722db2e991a2aa07f6f9002377f7f99c93d.tar.gz amarok-a2971722db2e991a2aa07f6f9002377f7f99c93d.zip | |
Fix unintended renaming
| -rw-r--r-- | amarok/src/engine/helix/helix-sp/hsphook.cpp | 6 | ||||
| -rw-r--r-- | amarok/src/engine/helix/helix-sp/hsphook.h | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/amarok/src/engine/helix/helix-sp/hsphook.cpp b/amarok/src/engine/helix/helix-sp/hsphook.cpp index 26b3ee7b..3434a77c 100644 --- a/amarok/src/engine/helix/helix-sp/hsphook.cpp +++ b/amarok/src/engine/helix/helix-sp/hsphook.cpp @@ -440,12 +440,12 @@ void HSPPostProcessor::scopeify(unsigned long time, unsigned char *data, size_t 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; - 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; } } @@ -455,7 +455,7 @@ void HSPPostProcessor::equalize(unsigned char *inbuf, unsigned char *outbuf, siz { int index, band, channel; 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 *dataout = (short int *) outbuf; diff --git a/amarok/src/engine/helix/helix-sp/hsphook.h b/amarok/src/engine/helix/helix-sp/hsphook.h index 53ca4f57..d3e1a79e 100644 --- a/amarok/src/engine/helix/helix-sp/hsphook.h +++ b/amarok/src/engine/helix/helix-sp/hsphook.h @@ -68,8 +68,8 @@ private: #define BAND_NUM 10 -#define ETQ_MAX_BANDS 10 -#define ETQ_CHANNELS 2 // Helix DNA currently only supports stereo +#define EQ_MAX_BANDS 10 +#define EQ_CHANNELS 2 // Helix DNA currently only supports stereo // Floating point typedef struct @@ -149,13 +149,13 @@ private: // Gain for each band // 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 // values should be between 0.0 and 1.0 - float preamp[ETQ_CHANNELS] __attribute__((aligned)); + float preamp[EQ_CHANNELS] __attribute__((aligned)); // Coefficients 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 int m_i; int m_j; |