aboutsummaryrefslogtreecommitdiff
path: root/audio/softsynth/mt32/tables.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'audio/softsynth/mt32/tables.cpp')
-rw-r--r--audio/softsynth/mt32/tables.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/audio/softsynth/mt32/tables.cpp b/audio/softsynth/mt32/tables.cpp
index 25ee0436db..9fdb595467 100644
--- a/audio/softsynth/mt32/tables.cpp
+++ b/audio/softsynth/mt32/tables.cpp
@@ -203,7 +203,7 @@ void Tables::initEnvelopes(float samplerate) {
void Tables::initMT32ConstantTables(Synth *synth) {
int lf;
- synth->printDebug("Initialising Pitch Tables");
+ synth->printDebug("Initializing Pitch Tables");
for (lf = -108; lf <= 108; lf++) {
tvfKeyfollowMult[lf + 108] = (int)(256 * powf(2.0f, (float)(lf / 24.0f)));
//synth->printDebug("KT %d = %d", f, keytable[f+108]);
@@ -668,7 +668,7 @@ bool Tables::initNotes(Synth *synth, PCMWaveEntry *pcmWaves, float rate, float m
bool abort = false;
synth->report(ReportType_progressInit, &progress);
for (int f = LOWEST_NOTE; f <= HIGHEST_NOTE; f++) {
- synth->printDebug("Initialising note %s%d", NoteNames[f % 12], (f / 12) - 2);
+ synth->printDebug("Initializing note %s%d", NoteNames[f % 12], (f / 12) - 2);
NoteLookup *noteLookup = &noteLookups[f - LOWEST_NOTE];
file = initNote(synth, noteLookup, (float)f, rate, masterTune, pcmWaves, file);
progress = (f - LOWEST_NOTE + 1) / (float)NUM_NOTES;
@@ -723,12 +723,12 @@ void Tables::freeNotes() {
}
}
}
- initialisedMasterTune = 0.0f;
+ initializedMasterTune = 0.0f;
}
Tables::Tables() {
- initialisedSampleRate = 0.0f;
- initialisedMasterTune = 0.0f;
+ initializedSampleRate = 0.0f;
+ initializedMasterTune = 0.0f;
memset(&noteLookups, 0, sizeof(noteLookups));
}
@@ -737,23 +737,23 @@ bool Tables::init(Synth *synth, PCMWaveEntry *pcmWaves, float sampleRate, float
synth->printDebug("Bad sampleRate (%f <= 0.0f)", (double)sampleRate);
return false;
}
- if (initialisedSampleRate == 0.0f) {
+ if (initializedSampleRate == 0.0f) {
initMT32ConstantTables(synth);
}
- if (initialisedSampleRate != sampleRate) {
+ if (initializedSampleRate != sampleRate) {
initFiltCoeff(sampleRate);
initEnvelopes(sampleRate);
for (int key = 12; key <= 108; key++) {
initDep(&keyLookups[key - 12], (float)key);
}
}
- if (initialisedSampleRate != sampleRate || initialisedMasterTune != masterTune) {
+ if (initializedSampleRate != sampleRate || initializedMasterTune != masterTune) {
freeNotes();
if (!initNotes(synth, pcmWaves, sampleRate, masterTune)) {
return false;
}
- initialisedSampleRate = sampleRate;
- initialisedMasterTune = masterTune;
+ initializedSampleRate = sampleRate;
+ initializedMasterTune = masterTune;
}
return true;
}