aboutsummaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorMatthew Hoops2011-05-25 11:17:11 -0400
committerMatthew Hoops2011-05-25 11:17:11 -0400
commit9539017ee35ce280758f22e589aa52c3baf9aaf3 (patch)
tree38578935a8649fcf2b052503365fbb5320a42103 /audio
parent7ff9f34aef3a89f167f1867fb31147571ba8112a (diff)
downloadscummvm-rg350-9539017ee35ce280758f22e589aa52c3baf9aaf3.tar.gz
scummvm-rg350-9539017ee35ce280758f22e589aa52c3baf9aaf3.tar.bz2
scummvm-rg350-9539017ee35ce280758f22e589aa52c3baf9aaf3.zip
ALL: initialise -> initialize
Diffstat (limited to 'audio')
-rw-r--r--audio/decoders/flac.cpp2
-rw-r--r--audio/mods/tfmx.cpp4
-rw-r--r--audio/softsynth/mt32.cpp14
-rw-r--r--audio/softsynth/mt32/partial.cpp2
-rw-r--r--audio/softsynth/mt32/synth.cpp22
-rw-r--r--audio/softsynth/mt32/synth.h2
-rw-r--r--audio/softsynth/mt32/tables.cpp20
-rw-r--r--audio/softsynth/mt32/tables.h4
8 files changed, 35 insertions, 35 deletions
diff --git a/audio/decoders/flac.cpp b/audio/decoders/flac.cpp
index b818d4f7e9..d06a7b9c0e 100644
--- a/audio/decoders/flac.cpp
+++ b/audio/decoders/flac.cpp
@@ -303,7 +303,7 @@ int FLACStream::readBuffer(int16 *buffer, const int numSamples) {
const uint numChannels = getChannels();
if (numChannels == 0) {
- warning("FLACStream: Stream not successfully initialised, cant playback");
+ warning("FLACStream: Stream not successfully initialized, cant playback");
return -1; // streaminfo wasnt read!
}
diff --git a/audio/mods/tfmx.cpp b/audio/mods/tfmx.cpp
index afc7d3b40b..a89da78af1 100644
--- a/audio/mods/tfmx.cpp
+++ b/audio/mods/tfmx.cpp
@@ -332,7 +332,7 @@ void Tfmx::macroRun(ChannelContext &channel) {
channel.vibLength = macroPtr[1];
channel.vibCount = macroPtr[1] / 2;
channel.vibDelta = macroPtr[3];
- // TODO: Perhaps a bug, vibValue could be left uninitialised
+ // TODO: Perhaps a bug, vibValue could be left uninitialized
if (!channel.portaDelta) {
channel.period = channel.refPeriod;
channel.vibValue = 0;
@@ -700,7 +700,7 @@ void Tfmx::noteCommand(const uint8 note, const uint8 param1, const uint8 param2,
channel.relVol = param2 >> 4;
channel.fineTune = (int8)param3;
- // TODO: the point where the channel gets initialised varies with the games, needs more research.
+ // TODO: the point where the channel gets initialized varies with the games, needs more research.
initMacroProgramm(channel);
channel.keyUp = false; // key down = playing a Note
diff --git a/audio/softsynth/mt32.cpp b/audio/softsynth/mt32.cpp
index a9a612f410..27a5a629c4 100644
--- a/audio/softsynth/mt32.cpp
+++ b/audio/softsynth/mt32.cpp
@@ -63,7 +63,7 @@ protected:
void generateSamples(int16 *buf, int len);
public:
- bool _initialising;
+ bool _initializing;
MidiDriver_MT32(Audio::Mixer *mixer);
virtual ~MidiDriver_MT32();
@@ -215,7 +215,7 @@ static MT32Emu::File *MT32_OpenFile(void *userData, const char *filename, MT32Em
}
static void MT32_PrintDebug(void *userData, const char *fmt, va_list list) {
- if (((MidiDriver_MT32 *)userData)->_initialising) {
+ if (((MidiDriver_MT32 *)userData)->_initializing) {
char buf[512];
vsnprintf(buf, 512, fmt, list);
@@ -239,7 +239,7 @@ static int MT32_Report(void *userData, MT32Emu::ReportType type, const void *rep
error("Failed to load MT32_PCM.ROM");
break;
case MT32Emu::ReportType_progressInit:
- if (((MidiDriver_MT32 *)userData)->_initialising) {
+ if (((MidiDriver_MT32 *)userData)->_initializing) {
drawProgress(*((const float *)reportData));
return eatSystemEvents();
}
@@ -283,7 +283,7 @@ MidiDriver_MT32::MidiDriver_MT32(Audio::Mixer *mixer) : MidiDriver_Emulated(mixe
// at rates other than 32KHz, thus we produce data at 32KHz and
// rely on Mixer to convert.
_outputRate = 32000; //_mixer->getOutputRate();
- _initialising = false;
+ _initializing = false;
}
MidiDriver_MT32::~MidiDriver_MT32() {
@@ -324,11 +324,11 @@ int MidiDriver_MT32::open() {
g_system->getPaletteManager()->setPalette(dummy_palette, 0, 3);
}
- _initialising = true;
- drawMessage(-1, _s("Initialising MT-32 Emulator"));
+ _initializing = true;
+ drawMessage(-1, _s("Initializing MT-32 Emulator"));
if (!_synth->open(prop))
return MERR_DEVICE_NOT_AVAILABLE;
- _initialising = false;
+ _initializing = false;
if (screenFormat.bytesPerPixel > 1)
g_system->fillScreen(screenFormat.RGBToColor(0, 0, 0));
diff --git a/audio/softsynth/mt32/partial.cpp b/audio/softsynth/mt32/partial.cpp
index d06634dc91..c4f2e94ebe 100644
--- a/audio/softsynth/mt32/partial.cpp
+++ b/audio/softsynth/mt32/partial.cpp
@@ -164,7 +164,7 @@ void Partial::startPartial(dpoly *usePoly, const PatchCache *useCache, Partial *
structurePosition = patchCache->structurePosition;
play = true;
- initKeyFollow(poly->freqnum); // Initialises noteVal, filtVal and realVal
+ initKeyFollow(poly->freqnum); // Initializes noteVal, filtVal and realVal
#if MT32EMU_ACCURATENOTES == 0
noteLookup = &synth->tables.noteLookups[noteVal - LOWEST_NOTE];
#else
diff --git a/audio/softsynth/mt32/synth.cpp b/audio/softsynth/mt32/synth.cpp
index 5e74b262ae..322b864b6e 100644
--- a/audio/softsynth/mt32/synth.cpp
+++ b/audio/softsynth/mt32/synth.cpp
@@ -426,36 +426,36 @@ bool Synth::open(SynthProperties &useProp) {
}
}
- printDebug("Initialising Timbre Bank A");
+ printDebug("Initializing Timbre Bank A");
if (!initTimbres(controlROMMap->timbreAMap, controlROMMap->timbreAOffset, 0)) {
return false;
}
- printDebug("Initialising Timbre Bank B");
+ printDebug("Initializing Timbre Bank B");
if (!initTimbres(controlROMMap->timbreBMap, controlROMMap->timbreBOffset, 64)) {
return false;
}
- printDebug("Initialising Timbre Bank R");
+ printDebug("Initializing Timbre Bank R");
if (!initRhythmTimbres(controlROMMap->timbreRMap, controlROMMap->timbreRCount)) {
return false;
}
- printDebug("Initialising Timbre Bank M");
- // CM-64 seems to initialise all bytes in this bank to 0.
+ printDebug("Initializing Timbre Bank M");
+ // CM-64 seems to initialize all bytes in this bank to 0.
memset(&mt32ram.timbres[128], 0, sizeof (mt32ram.timbres[128]) * 64);
partialManager = new PartialManager(this);
pcmWaves = new PCMWaveEntry[controlROMMap->pcmCount];
- printDebug("Initialising PCM List");
+ printDebug("Initializing PCM List");
initPCMList(controlROMMap->pcmTable, controlROMMap->pcmCount);
- printDebug("Initialising Rhythm Temp");
+ printDebug("Initializing Rhythm Temp");
memcpy(mt32ram.rhythmSettings, &controlROMData[controlROMMap->rhythmSettings], controlROMMap->rhythmSettingsCount * 4);
- printDebug("Initialising Patches");
+ printDebug("Initializing Patches");
for (Bit8u i = 0; i < 128; i++) {
PatchParam *patch = &mt32ram.patches[i];
patch->timbreGroup = i / 64;
@@ -468,9 +468,9 @@ bool Synth::open(SynthProperties &useProp) {
patch->dummy = 0;
}
- printDebug("Initialising System");
+ printDebug("Initializing System");
// The MT-32 manual claims that "Standard pitch" is 442Hz.
- mt32ram.system.masterTune = 0x40; // Confirmed on CM-64 as 0x4A, but SCUMM games use 0x40 and we don't want to initialise twice
+ mt32ram.system.masterTune = 0x40; // Confirmed on CM-64 as 0x4A, but SCUMM games use 0x40 and we don't want to initialize twice
mt32ram.system.reverbMode = 0; // Confirmed
mt32ram.system.reverbTime = 5; // Confirmed
mt32ram.system.reverbLevel = 3; // Confirmed
@@ -792,7 +792,7 @@ void Synth::writeSysex(unsigned char device, const Bit8u *sysex, Bit32u len) {
for (;;) {
// Find the appropriate memory region
int regionNum;
- const MemoryRegion *region = NULL; // Initialised to please compiler
+ const MemoryRegion *region = NULL; // Initialized to please compiler
for (regionNum = 0; regionNum < NUM_REGIONS; regionNum++) {
region = &memoryRegions[regionNum];
if (region->contains(addr)) {
diff --git a/audio/softsynth/mt32/synth.h b/audio/softsynth/mt32/synth.h
index edda446287..0ef2c9d135 100644
--- a/audio/softsynth/mt32/synth.h
+++ b/audio/softsynth/mt32/synth.h
@@ -263,7 +263,7 @@ public:
Synth();
~Synth();
- // Used to initialise the MT-32. Must be called before any other function.
+ // Used to initialize the MT-32. Must be called before any other function.
// Returns true if initialization was sucessful, otherwise returns false.
bool open(SynthProperties &useProp);
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;
}
diff --git a/audio/softsynth/mt32/tables.h b/audio/softsynth/mt32/tables.h
index d9af5114b2..9950323e7b 100644
--- a/audio/softsynth/mt32/tables.h
+++ b/audio/softsynth/mt32/tables.h
@@ -69,8 +69,8 @@ struct KeyLookup {
};
class Tables {
- float initialisedSampleRate;
- float initialisedMasterTune;
+ float initializedSampleRate;
+ float initializedMasterTune;
void initMT32ConstantTables(Synth *synth);
static Bit16s clampWF(Synth *synth, const char *n, float ampVal, double input);
static File *initWave(Synth *synth, NoteLookup *noteLookup, float ampsize, float div2, File *file);