[Scummvm-cvs-logs] SF.net SVN: scummvm:[47279] scummvm/trunk
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Tue Jan 12 22:07:57 CET 2010
Revision: 47279
http://scummvm.svn.sourceforge.net/scummvm/?rev=47279&view=rev
Author: lordhoto
Date: 2010-01-12 21:07:56 +0000 (Tue, 12 Jan 2010)
Log Message:
-----------
Rename all "Adlib" uses to "AdLib" to match the real name of the sound card / company.
Check this for reference:
http://en.wikipedia.org/wiki/Ad_Lib,_Inc.
http://www.crossfire-designs.de/images/articles/soundcards/adlib.jpg (note the upper left of the card)
This commit does not touch "adlib" and "ADLIB" uses!
Also it does not update all the SCUMM detection entries, which still use "Adlib".
Modified Paths:
--------------
scummvm/trunk/engines/agos/midi.cpp
scummvm/trunk/engines/cine/cine.cpp
scummvm/trunk/engines/cine/sound.cpp
scummvm/trunk/engines/cruise/cruise_main.cpp
scummvm/trunk/engines/cruise/sound.cpp
scummvm/trunk/engines/draci/draci.cpp
scummvm/trunk/engines/draci/music.cpp
scummvm/trunk/engines/gob/detection.cpp
scummvm/trunk/engines/gob/gob.cpp
scummvm/trunk/engines/gob/gob.h
scummvm/trunk/engines/gob/sound/adlib.cpp
scummvm/trunk/engines/gob/sound/sound.cpp
scummvm/trunk/engines/gob/sound/sound.h
scummvm/trunk/engines/groovie/music.cpp
scummvm/trunk/engines/kyra/kyra_v1.cpp
scummvm/trunk/engines/kyra/lol.cpp
scummvm/trunk/engines/kyra/scene_hof.cpp
scummvm/trunk/engines/kyra/script_hof.cpp
scummvm/trunk/engines/kyra/sound.h
scummvm/trunk/engines/kyra/sound_adlib.cpp
scummvm/trunk/engines/kyra/sound_adlib.h
scummvm/trunk/engines/m4/mads_anim.cpp
scummvm/trunk/engines/made/made.cpp
scummvm/trunk/engines/queen/midiadlib.cpp
scummvm/trunk/engines/queen/music.cpp
scummvm/trunk/engines/saga/music.cpp
scummvm/trunk/engines/saga/music.h
scummvm/trunk/engines/saga/saga.cpp
scummvm/trunk/engines/sci/resource.cpp
scummvm/trunk/engines/sci/sound/iterator/core.cpp
scummvm/trunk/engines/sci/sound/iterator/iterator.cpp
scummvm/trunk/engines/sci/sound/midiparser_sci.h
scummvm/trunk/engines/sci/sound/music.cpp
scummvm/trunk/engines/sci/sound/music.h
scummvm/trunk/engines/sci/sound/softseq/adlib.cpp
scummvm/trunk/engines/sci/sound/softseq/mididriver.h
scummvm/trunk/engines/scumm/imuse/imuse.cpp
scummvm/trunk/engines/scumm/imuse/imuse_internal.h
scummvm/trunk/engines/scumm/imuse/imuse_part.cpp
scummvm/trunk/engines/scumm/imuse/imuse_player.cpp
scummvm/trunk/engines/scumm/imuse/instrument.cpp
scummvm/trunk/engines/scumm/imuse/instrument.h
scummvm/trunk/engines/scumm/imuse/sysex_scumm.cpp
scummvm/trunk/engines/scumm/scumm.cpp
scummvm/trunk/engines/scumm/vars.cpp
scummvm/trunk/engines/sky/music/adlibchannel.cpp
scummvm/trunk/engines/sky/music/adlibchannel.h
scummvm/trunk/engines/sky/music/adlibmusic.cpp
scummvm/trunk/engines/sky/music/adlibmusic.h
scummvm/trunk/engines/sky/sky.cpp
scummvm/trunk/engines/tinsel/tinsel.cpp
scummvm/trunk/sound/fmopl.cpp
scummvm/trunk/sound/fmopl.h
scummvm/trunk/sound/softsynth/adlib.cpp
Modified: scummvm/trunk/engines/agos/midi.cpp
===================================================================
--- scummvm/trunk/engines/agos/midi.cpp 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/agos/midi.cpp 2010-01-12 21:07:56 UTC (rev 47279)
@@ -130,7 +130,7 @@
// If I understand it correctly, the current standard indicates
// that the volume should be reset, but the next revision will
// exclude it. On my system, both ALSA and FluidSynth seem to
- // reset it, while Adlib does not. Let's follow the majority.
+ // reset it, while AdLib does not. Let's follow the majority.
_current->volume[channel] = 127;
}
Modified: scummvm/trunk/engines/cine/cine.cpp
===================================================================
--- scummvm/trunk/engines/cine/cine.cpp 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/cine/cine.cpp 2010-01-12 21:07:56 UTC (rev 47279)
@@ -58,9 +58,9 @@
// Setup mixer
_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
- // Use music volume for plain sound types (At least the Adlib player uses a plain sound type
+ // Use music volume for plain sound types (At least the AdLib player uses a plain sound type
// so previously the music and sfx volume controls didn't affect it at all).
- // FIXME: Make Adlib player differentiate between playing sound effects and music and remove this.
+ // FIXME: Make AdLib player differentiate between playing sound effects and music and remove this.
_mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, ConfMan.getInt("music_volume"));
g_cine = this;
Modified: scummvm/trunk/engines/cine/sound.cpp
===================================================================
--- scummvm/trunk/engines/cine/sound.cpp 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/cine/sound.cpp 2010-01-12 21:07:56 UTC (rev 47279)
@@ -78,7 +78,7 @@
const int PCSoundDriver::_noteTableCount = ARRAYSIZE(_noteTable);
-struct AdlibRegisterSoundInstrument {
+struct AdLibRegisterSoundInstrument {
uint8 vibrato;
uint8 attackDecay;
uint8 sustainRelease;
@@ -88,20 +88,20 @@
uint8 freqMod;
};
-struct AdlibSoundInstrument {
+struct AdLibSoundInstrument {
byte mode;
byte channel;
- AdlibRegisterSoundInstrument regMod;
- AdlibRegisterSoundInstrument regCar;
+ AdLibRegisterSoundInstrument regMod;
+ AdLibRegisterSoundInstrument regCar;
byte waveSelectMod;
byte waveSelectCar;
byte amDepth;
};
-class AdlibSoundDriver : public PCSoundDriver, Audio::AudioStream {
+class AdLibSoundDriver : public PCSoundDriver, Audio::AudioStream {
public:
- AdlibSoundDriver(Audio::Mixer *mixer);
- virtual ~AdlibSoundDriver();
+ AdLibSoundDriver(Audio::Mixer *mixer);
+ virtual ~AdLibSoundDriver();
// PCSoundDriver interface
virtual void setupChannel(int channel, const byte *data, int instrument, int volume);
@@ -117,8 +117,8 @@
void initCard();
void update(int16 *buf, int len);
void setupInstrument(const byte *data, int channel);
- void loadRegisterInstrument(const byte *data, AdlibRegisterSoundInstrument *reg);
- virtual void loadInstrument(const byte *data, AdlibSoundInstrument *asi) = 0;
+ void loadRegisterInstrument(const byte *data, AdLibRegisterSoundInstrument *reg);
+ virtual void loadInstrument(const byte *data, AdLibSoundInstrument *asi) = 0;
protected:
FM_OPL *_opl;
@@ -128,7 +128,7 @@
byte _vibrato;
int _channelsVolumeTable[4];
- AdlibSoundInstrument _instrumentsTable[4];
+ AdLibSoundInstrument _instrumentsTable[4];
static const int _freqTable[];
static const int _freqTableCount;
@@ -138,41 +138,41 @@
static const int _voiceOperatorsTableCount;
};
-const int AdlibSoundDriver::_freqTable[] = {
+const int AdLibSoundDriver::_freqTable[] = {
0x157, 0x16C, 0x181, 0x198, 0x1B1, 0x1CB,
0x1E6, 0x203, 0x222, 0x243, 0x266, 0x28A
};
-const int AdlibSoundDriver::_freqTableCount = ARRAYSIZE(_freqTable);
+const int AdLibSoundDriver::_freqTableCount = ARRAYSIZE(_freqTable);
-const int AdlibSoundDriver::_operatorsTable[] = {
+const int AdLibSoundDriver::_operatorsTable[] = {
0, 1, 2, 3, 4, 5, 8, 9, 10, 11, 12, 13, 16, 17, 18, 19, 20, 21
};
-const int AdlibSoundDriver::_operatorsTableCount = ARRAYSIZE(_operatorsTable);
+const int AdLibSoundDriver::_operatorsTableCount = ARRAYSIZE(_operatorsTable);
-const int AdlibSoundDriver::_voiceOperatorsTable[] = {
+const int AdLibSoundDriver::_voiceOperatorsTable[] = {
0, 3, 1, 4, 2, 5, 6, 9, 7, 10, 8, 11, 12, 15, 16, 16, 14, 14, 17, 17, 13, 13
};
-const int AdlibSoundDriver::_voiceOperatorsTableCount = ARRAYSIZE(_voiceOperatorsTable);
+const int AdLibSoundDriver::_voiceOperatorsTableCount = ARRAYSIZE(_voiceOperatorsTable);
-// Future Wars Adlib driver
-class AdlibSoundDriverINS : public AdlibSoundDriver {
+// Future Wars AdLib driver
+class AdLibSoundDriverINS : public AdLibSoundDriver {
public:
- AdlibSoundDriverINS(Audio::Mixer *mixer) : AdlibSoundDriver(mixer) {}
+ AdLibSoundDriverINS(Audio::Mixer *mixer) : AdLibSoundDriver(mixer) {}
virtual const char *getInstrumentExtension() const { return ".INS"; }
- virtual void loadInstrument(const byte *data, AdlibSoundInstrument *asi);
+ virtual void loadInstrument(const byte *data, AdLibSoundInstrument *asi);
virtual void setChannelFrequency(int channel, int frequency);
virtual void playSample(const byte *data, int size, int channel, int volume);
};
-// Operation Stealth Adlib driver
-class AdlibSoundDriverADL : public AdlibSoundDriver {
+// Operation Stealth AdLib driver
+class AdLibSoundDriverADL : public AdLibSoundDriver {
public:
- AdlibSoundDriverADL(Audio::Mixer *mixer) : AdlibSoundDriver(mixer) {}
+ AdLibSoundDriverADL(Audio::Mixer *mixer) : AdLibSoundDriver(mixer) {}
virtual const char *getInstrumentExtension() const { return ".ADL"; }
- virtual void loadInstrument(const byte *data, AdlibSoundInstrument *asi);
+ virtual void loadInstrument(const byte *data, AdLibSoundInstrument *asi);
virtual void setChannelFrequency(int channel, int frequency);
virtual void playSample(const byte *data, int size, int channel, int volume);
};
@@ -237,22 +237,22 @@
stopAll();
}
-AdlibSoundDriver::AdlibSoundDriver(Audio::Mixer *mixer)
+AdLibSoundDriver::AdLibSoundDriver(Audio::Mixer *mixer)
: _mixer(mixer) {
_sampleRate = _mixer->getOutputRate();
- _opl = makeAdlibOPL(_sampleRate);
+ _opl = makeAdLibOPL(_sampleRate);
memset(_channelsVolumeTable, 0, sizeof(_channelsVolumeTable));
memset(_instrumentsTable, 0, sizeof(_instrumentsTable));
initCard();
_mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
}
-AdlibSoundDriver::~AdlibSoundDriver() {
+AdLibSoundDriver::~AdLibSoundDriver() {
_mixer->stopHandle(_soundHandle);
OPLDestroy(_opl);
}
-void AdlibSoundDriver::setupChannel(int channel, const byte *data, int instrument, int volume) {
+void AdLibSoundDriver::setupChannel(int channel, const byte *data, int instrument, int volume) {
assert(channel < 4);
if (data) {
if (volume > 80) {
@@ -269,9 +269,9 @@
}
}
-void AdlibSoundDriver::stopChannel(int channel) {
+void AdLibSoundDriver::stopChannel(int channel) {
assert(channel < 4);
- AdlibSoundInstrument *ins = &_instrumentsTable[channel];
+ AdLibSoundInstrument *ins = &_instrumentsTable[channel];
if (ins->mode != 0 && ins->channel == 6) {
channel = 6;
}
@@ -284,7 +284,7 @@
}
}
-void AdlibSoundDriver::stopAll() {
+void AdLibSoundDriver::stopAll() {
int i;
for (i = 0; i < 18; ++i) {
OPLWriteReg(_opl, 0x40 | _operatorsTable[i], 63);
@@ -295,12 +295,12 @@
OPLWriteReg(_opl, 0xBD, 0);
}
-int AdlibSoundDriver::readBuffer(int16 *buffer, const int numSamples) {
+int AdLibSoundDriver::readBuffer(int16 *buffer, const int numSamples) {
update(buffer, numSamples);
return numSamples;
}
-void AdlibSoundDriver::initCard() {
+void AdLibSoundDriver::initCard() {
_vibrato = 0x20;
OPLWriteReg(_opl, 0xBD, _vibrato);
OPLWriteReg(_opl, 0x08, 0x40);
@@ -324,7 +324,7 @@
OPLWriteReg(_opl, 1, 0);
}
-void AdlibSoundDriver::update(int16 *buf, int len) {
+void AdLibSoundDriver::update(int16 *buf, int len) {
static int samplesLeft = 0;
while (len != 0) {
int count = samplesLeft;
@@ -344,13 +344,13 @@
}
}
-void AdlibSoundDriver::setupInstrument(const byte *data, int channel) {
+void AdLibSoundDriver::setupInstrument(const byte *data, int channel) {
assert(channel < 4);
- AdlibSoundInstrument *ins = &_instrumentsTable[channel];
+ AdLibSoundInstrument *ins = &_instrumentsTable[channel];
loadInstrument(data, ins);
int mod, car, tmp;
- const AdlibRegisterSoundInstrument *reg;
+ const AdLibRegisterSoundInstrument *reg;
if (ins->mode != 0) {
mod = _operatorsTable[_voiceOperatorsTable[2 * ins->channel + 0]];
@@ -390,7 +390,7 @@
OPLWriteReg(_opl, 0xE0 | car, ins->waveSelectCar);
}
-void AdlibSoundDriver::loadRegisterInstrument(const byte *data, AdlibRegisterSoundInstrument *reg) {
+void AdLibSoundDriver::loadRegisterInstrument(const byte *data, AdLibRegisterSoundInstrument *reg) {
reg->vibrato = 0;
if (READ_LE_UINT16(data + 18)) { // amplitude vibrato
reg->vibrato |= 0x80;
@@ -422,7 +422,7 @@
reg->freqMod = READ_LE_UINT16(data + 24);
}
-void AdlibSoundDriverINS::loadInstrument(const byte *data, AdlibSoundInstrument *asi) {
+void AdLibSoundDriverINS::loadInstrument(const byte *data, AdLibSoundInstrument *asi) {
asi->mode = *data++;
asi->channel = *data++;
loadRegisterInstrument(data, &asi->regMod); data += 26;
@@ -432,9 +432,9 @@
asi->amDepth = data[0]; data += 2;
}
-void AdlibSoundDriverINS::setChannelFrequency(int channel, int frequency) {
+void AdLibSoundDriverINS::setChannelFrequency(int channel, int frequency) {
assert(channel < 4);
- AdlibSoundInstrument *ins = &_instrumentsTable[channel];
+ AdLibSoundInstrument *ins = &_instrumentsTable[channel];
if (ins->mode != 0 && ins->channel == 6) {
channel = 6;
}
@@ -458,12 +458,12 @@
}
}
-void AdlibSoundDriverINS::playSample(const byte *data, int size, int channel, int volume) {
+void AdLibSoundDriverINS::playSample(const byte *data, int size, int channel, int volume) {
assert(channel < 4);
_channelsVolumeTable[channel] = 127;
resetChannel(channel);
setupInstrument(data + 257, channel);
- AdlibSoundInstrument *ins = &_instrumentsTable[channel];
+ AdLibSoundInstrument *ins = &_instrumentsTable[channel];
if (ins->mode != 0 && ins->channel == 6) {
channel = 6;
}
@@ -483,7 +483,7 @@
}
}
-void AdlibSoundDriverADL::loadInstrument(const byte *data, AdlibSoundInstrument *asi) {
+void AdLibSoundDriverADL::loadInstrument(const byte *data, AdLibSoundInstrument *asi) {
asi->mode = *data++;
asi->channel = *data++;
asi->waveSelectMod = *data++ & 3;
@@ -494,9 +494,9 @@
loadRegisterInstrument(data, &asi->regCar); data += 26;
}
-void AdlibSoundDriverADL::setChannelFrequency(int channel, int frequency) {
+void AdLibSoundDriverADL::setChannelFrequency(int channel, int frequency) {
assert(channel < 4);
- AdlibSoundInstrument *ins = &_instrumentsTable[channel];
+ AdLibSoundInstrument *ins = &_instrumentsTable[channel];
if (ins->mode != 0) {
channel = ins->channel;
if (channel == 9) {
@@ -527,11 +527,11 @@
}
}
-void AdlibSoundDriverADL::playSample(const byte *data, int size, int channel, int volume) {
+void AdLibSoundDriverADL::playSample(const byte *data, int size, int channel, int volume) {
assert(channel < 4);
_channelsVolumeTable[channel] = 127;
setupInstrument(data, channel);
- AdlibSoundInstrument *ins = &_instrumentsTable[channel];
+ AdLibSoundInstrument *ins = &_instrumentsTable[channel];
if (ins->mode != 0 && ins->channel == 6) {
OPLWriteReg(_opl, 0xB0 | channel, 0);
}
@@ -723,9 +723,9 @@
PCSound::PCSound(Audio::Mixer *mixer, CineEngine *vm)
: Sound(mixer, vm) {
if (_vm->getGameType() == GType_FW) {
- _soundDriver = new AdlibSoundDriverINS(_mixer);
+ _soundDriver = new AdLibSoundDriverINS(_mixer);
} else {
- _soundDriver = new AdlibSoundDriverADL(_mixer);
+ _soundDriver = new AdLibSoundDriverADL(_mixer);
}
_player = new PCSoundFxPlayer(_soundDriver);
}
Modified: scummvm/trunk/engines/cruise/cruise_main.cpp
===================================================================
--- scummvm/trunk/engines/cruise/cruise_main.cpp 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/cruise/cruise_main.cpp 2010-01-12 21:07:56 UTC (rev 47279)
@@ -364,7 +364,7 @@
* strcat(buffer, ".H32");
*}
* else
- * if (useAdlib)
+ * if (useAdLib)
* { */
strcat(buffer,".ADL");
/* }
Modified: scummvm/trunk/engines/cruise/sound.cpp
===================================================================
--- scummvm/trunk/engines/cruise/sound.cpp 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/cruise/sound.cpp 2010-01-12 21:07:56 UTC (rev 47279)
@@ -82,7 +82,7 @@
const int PCSoundDriver::_noteTableCount = ARRAYSIZE(_noteTable);
-struct AdlibRegisterSoundInstrument {
+struct AdLibRegisterSoundInstrument {
uint8 vibrato;
uint8 attackDecay;
uint8 sustainRelease;
@@ -92,11 +92,11 @@
uint8 freqMod;
};
-struct AdlibSoundInstrument {
+struct AdLibSoundInstrument {
byte mode;
byte channel;
- AdlibRegisterSoundInstrument regMod;
- AdlibRegisterSoundInstrument regCar;
+ AdLibRegisterSoundInstrument regMod;
+ AdLibRegisterSoundInstrument regCar;
byte waveSelectMod;
byte waveSelectCar;
byte amDepth;
@@ -107,10 +107,10 @@
int adjusted;
};
-class AdlibSoundDriver : public PCSoundDriver, Audio::AudioStream {
+class AdLibSoundDriver : public PCSoundDriver, Audio::AudioStream {
public:
- AdlibSoundDriver(Audio::Mixer *mixer);
- virtual ~AdlibSoundDriver();
+ AdLibSoundDriver(Audio::Mixer *mixer);
+ virtual ~AdLibSoundDriver();
// PCSoundDriver interface
virtual void setupChannel(int channel, const byte *data, int instrument, int volume);
@@ -126,9 +126,9 @@
void initCard();
void update(int16 *buf, int len);
void setupInstrument(const byte *data, int channel);
- void setupInstrument(const AdlibSoundInstrument *ins, int channel);
- void loadRegisterInstrument(const byte *data, AdlibRegisterSoundInstrument *reg);
- virtual void loadInstrument(const byte *data, AdlibSoundInstrument *asi) = 0;
+ void setupInstrument(const AdLibSoundInstrument *ins, int channel);
+ void loadRegisterInstrument(const byte *data, AdLibRegisterSoundInstrument *reg);
+ virtual void loadInstrument(const byte *data, AdLibSoundInstrument *asi) = 0;
virtual void syncSounds();
void adjustVolume(int channel, int volume);
@@ -141,7 +141,7 @@
byte _vibrato;
VolumeEntry _channelsVolumeTable[5];
- AdlibSoundInstrument _instrumentsTable[5];
+ AdLibSoundInstrument _instrumentsTable[5];
static const int _freqTable[];
static const int _freqTableCount;
@@ -151,30 +151,30 @@
static const int _voiceOperatorsTableCount;
};
-const int AdlibSoundDriver::_freqTable[] = {
+const int AdLibSoundDriver::_freqTable[] = {
0x157, 0x16C, 0x181, 0x198, 0x1B1, 0x1CB,
0x1E6, 0x203, 0x222, 0x243, 0x266, 0x28A
};
-const int AdlibSoundDriver::_freqTableCount = ARRAYSIZE(_freqTable);
+const int AdLibSoundDriver::_freqTableCount = ARRAYSIZE(_freqTable);
-const int AdlibSoundDriver::_operatorsTable[] = {
+const int AdLibSoundDriver::_operatorsTable[] = {
0, 1, 2, 3, 4, 5, 8, 9, 10, 11, 12, 13, 16, 17, 18, 19, 20, 21
};
-const int AdlibSoundDriver::_operatorsTableCount = ARRAYSIZE(_operatorsTable);
+const int AdLibSoundDriver::_operatorsTableCount = ARRAYSIZE(_operatorsTable);
-const int AdlibSoundDriver::_voiceOperatorsTable[] = {
+const int AdLibSoundDriver::_voiceOperatorsTable[] = {
0, 3, 1, 4, 2, 5, 6, 9, 7, 10, 8, 11, 12, 15, 16, 16, 14, 14, 17, 17, 13, 13
};
-const int AdlibSoundDriver::_voiceOperatorsTableCount = ARRAYSIZE(_voiceOperatorsTable);
+const int AdLibSoundDriver::_voiceOperatorsTableCount = ARRAYSIZE(_voiceOperatorsTable);
-class AdlibSoundDriverADL : public AdlibSoundDriver {
+class AdLibSoundDriverADL : public AdLibSoundDriver {
public:
- AdlibSoundDriverADL(Audio::Mixer *mixer) : AdlibSoundDriver(mixer) {}
+ AdLibSoundDriverADL(Audio::Mixer *mixer) : AdLibSoundDriver(mixer) {}
virtual const char *getInstrumentExtension() const { return ".ADL"; }
- virtual void loadInstrument(const byte *data, AdlibSoundInstrument *asi);
+ virtual void loadInstrument(const byte *data, AdLibSoundInstrument *asi);
virtual void setChannelFrequency(int channel, int frequency);
virtual void playSample(const byte *data, int size, int channel, int volume);
};
@@ -287,10 +287,10 @@
_sfxVolume = ConfMan.getBool("sfx_mute") ? 0 : MIN(255, ConfMan.getInt("sfx_volume"));
}
-AdlibSoundDriver::AdlibSoundDriver(Audio::Mixer *mixer)
+AdLibSoundDriver::AdLibSoundDriver(Audio::Mixer *mixer)
: _mixer(mixer) {
_sampleRate = _mixer->getOutputRate();
- _opl = makeAdlibOPL(_sampleRate);
+ _opl = makeAdLibOPL(_sampleRate);
for (int i = 0; i < 5; ++i) {
_channelsVolumeTable[i].original = 0;
@@ -304,23 +304,23 @@
_sfxVolume = ConfMan.getBool("sfx_mute") ? 0 : MIN(255, ConfMan.getInt("sfx_volume"));
}
-AdlibSoundDriver::~AdlibSoundDriver() {
+AdLibSoundDriver::~AdLibSoundDriver() {
_mixer->stopHandle(_soundHandle);
OPLDestroy(_opl);
}
-void AdlibSoundDriver::syncSounds() {
+void AdLibSoundDriver::syncSounds() {
PCSoundDriver::syncSounds();
// Force all instruments to reload on the next playing point
for (int i = 0; i < 5; ++i) {
adjustVolume(i, _channelsVolumeTable[i].original);
- AdlibSoundInstrument *ins = &_instrumentsTable[i];
+ AdLibSoundInstrument *ins = &_instrumentsTable[i];
setupInstrument(ins, i);
}
}
-void AdlibSoundDriver::adjustVolume(int channel, int volume) {
+void AdLibSoundDriver::adjustVolume(int channel, int volume) {
_channelsVolumeTable[channel].original = volume;
if (volume > 80) {
@@ -342,7 +342,7 @@
_channelsVolumeTable[channel].adjusted = volume;
}
-void AdlibSoundDriver::setupChannel(int channel, const byte *data, int instrument, int volume) {
+void AdLibSoundDriver::setupChannel(int channel, const byte *data, int instrument, int volume) {
assert(channel < 5);
if (data) {
adjustVolume(channel, volume);
@@ -350,9 +350,9 @@
}
}
-void AdlibSoundDriver::stopChannel(int channel) {
+void AdLibSoundDriver::stopChannel(int channel) {
assert(channel < 5);
- AdlibSoundInstrument *ins = &_instrumentsTable[channel];
+ AdLibSoundInstrument *ins = &_instrumentsTable[channel];
if (ins->mode != 0 && ins->channel == 6) {
channel = 6;
}
@@ -365,7 +365,7 @@
}
}
-void AdlibSoundDriver::stopAll() {
+void AdLibSoundDriver::stopAll() {
int i;
for (i = 0; i < 18; ++i) {
OPLWriteReg(_opl, 0x40 | _operatorsTable[i], 63);
@@ -376,12 +376,12 @@
OPLWriteReg(_opl, 0xBD, 0);
}
-int AdlibSoundDriver::readBuffer(int16 *buffer, const int numSamples) {
+int AdLibSoundDriver::readBuffer(int16 *buffer, const int numSamples) {
update(buffer, numSamples);
return numSamples;
}
-void AdlibSoundDriver::initCard() {
+void AdLibSoundDriver::initCard() {
_vibrato = 0x20;
OPLWriteReg(_opl, 0xBD, _vibrato);
OPLWriteReg(_opl, 0x08, 0x40);
@@ -405,7 +405,7 @@
OPLWriteReg(_opl, 1, 0);
}
-void AdlibSoundDriver::update(int16 *buf, int len) {
+void AdLibSoundDriver::update(int16 *buf, int len) {
static int samplesLeft = 0;
while (len != 0) {
int count = samplesLeft;
@@ -425,17 +425,17 @@
}
}
-void AdlibSoundDriver::setupInstrument(const byte *data, int channel) {
+void AdLibSoundDriver::setupInstrument(const byte *data, int channel) {
assert(channel < 5);
- AdlibSoundInstrument *ins = &_instrumentsTable[channel];
+ AdLibSoundInstrument *ins = &_instrumentsTable[channel];
loadInstrument(data, ins);
setupInstrument(ins, channel);
}
-void AdlibSoundDriver::setupInstrument(const AdlibSoundInstrument *ins, int channel) {
+void AdLibSoundDriver::setupInstrument(const AdLibSoundInstrument *ins, int channel) {
int mod, car, tmp;
- const AdlibRegisterSoundInstrument *reg;
+ const AdLibRegisterSoundInstrument *reg;
if (ins->mode != 0) {
mod = _operatorsTable[_voiceOperatorsTable[2 * ins->channel + 0]];
@@ -475,7 +475,7 @@
OPLWriteReg(_opl, 0xE0 | car, ins->waveSelectCar);
}
-void AdlibSoundDriver::loadRegisterInstrument(const byte *data, AdlibRegisterSoundInstrument *reg) {
+void AdLibSoundDriver::loadRegisterInstrument(const byte *data, AdLibRegisterSoundInstrument *reg) {
reg->vibrato = 0;
if (READ_LE_UINT16(data + 18)) { // amplitude vibrato
reg->vibrato |= 0x80;
@@ -507,7 +507,7 @@
reg->freqMod = READ_LE_UINT16(data + 24);
}
-void AdlibSoundDriverADL::loadInstrument(const byte *data, AdlibSoundInstrument *asi) {
+void AdLibSoundDriverADL::loadInstrument(const byte *data, AdLibSoundInstrument *asi) {
asi->mode = *data++;
asi->channel = *data++;
asi->waveSelectMod = *data++ & 3;
@@ -518,9 +518,9 @@
loadRegisterInstrument(data, &asi->regCar); data += 26;
}
-void AdlibSoundDriverADL::setChannelFrequency(int channel, int frequency) {
+void AdLibSoundDriverADL::setChannelFrequency(int channel, int frequency) {
assert(channel < 5);
- AdlibSoundInstrument *ins = &_instrumentsTable[channel];
+ AdLibSoundInstrument *ins = &_instrumentsTable[channel];
if (ins->mode != 0) {
channel = ins->channel;
if (channel == 9) {
@@ -553,12 +553,12 @@
}
}
-void AdlibSoundDriverADL::playSample(const byte *data, int size, int channel, int volume) {
+void AdLibSoundDriverADL::playSample(const byte *data, int size, int channel, int volume) {
assert(channel < 5);
adjustVolume(channel, 127);
setupInstrument(data, channel);
- AdlibSoundInstrument *ins = &_instrumentsTable[channel];
+ AdLibSoundInstrument *ins = &_instrumentsTable[channel];
if (ins->mode != 0 && ins->channel == 6) {
OPLWriteReg(_opl, 0xB0 | channel, 0);
}
@@ -780,7 +780,7 @@
PCSound::PCSound(Audio::Mixer *mixer, CruiseEngine *vm) {
_vm = vm;
_mixer = mixer;
- _soundDriver = new AdlibSoundDriverADL(_mixer);
+ _soundDriver = new AdLibSoundDriverADL(_mixer);
_player = new PCSoundFxPlayer(_soundDriver);
}
Modified: scummvm/trunk/engines/draci/draci.cpp
===================================================================
--- scummvm/trunk/engines/draci/draci.cpp 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/draci/draci.cpp 2010-01-12 21:07:56 UTC (rev 47279)
@@ -133,7 +133,7 @@
_music = new MusicPlayer(_midiDriver, musicPathMask);
_music->setNativeMT32(native_mt32);
- //_music->setAdlib(adlib);
+ //_music->setAdLib(adlib);
// Load the game's fonts
_smallFont = new Font(kFontSmall);
Modified: scummvm/trunk/engines/draci/music.cpp
===================================================================
--- scummvm/trunk/engines/draci/music.cpp 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/draci/music.cpp 2010-01-12 21:07:56 UTC (rev 47279)
@@ -45,7 +45,7 @@
_midiMusicData = NULL;
// TODO: Load cmf.ins with the instrument table. It seems that an
- // interface for such an operation is supported for Adlib. Maybe for
+ // interface for such an operation is supported for AdLib. Maybe for
// this card, setting instruments is necessary.
}
Modified: scummvm/trunk/engines/gob/detection.cpp
===================================================================
--- scummvm/trunk/engines/gob/detection.cpp 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/gob/detection.cpp 2010-01-12 21:07:56 UTC (rev 47279)
@@ -147,7 +147,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // CD 1.000 version.
@@ -427,7 +427,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by paul66 in bug report #1652352
@@ -441,7 +441,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by paul66 in bug report #1652352
@@ -455,7 +455,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by paul66 in bug report #1652352
@@ -469,7 +469,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by paul66 in bug report #1652352
@@ -483,7 +483,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by Hkz on #scummvm
@@ -501,7 +501,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by Hkz on #scummvm
@@ -519,7 +519,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by Hkz on #scummvm
@@ -537,7 +537,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by Hkz on #scummvm
@@ -555,7 +555,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by Hkz on #scummvm
@@ -573,7 +573,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -591,7 +591,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -609,7 +609,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -627,7 +627,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -645,7 +645,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -663,7 +663,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Found in Found in french ADI 2.5 Anglais Multimedia 5e
@@ -677,7 +677,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Found in Found in french ADI 2.5 Anglais Multimedia 5e
@@ -691,7 +691,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Found in Found in french ADI 2.5 Anglais Multimedia 5e
@@ -705,7 +705,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Found in Found in french ADI 2.5 Anglais Multimedia 5e
@@ -719,7 +719,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Found in Found in french ADI 2.5 Anglais Multimedia 5e
@@ -733,7 +733,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -747,7 +747,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, "AVT003.TOT", 0
},
{ // Supplied by fac76 in bug report #1883808
@@ -821,7 +821,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by koalet in bug report #2478585
@@ -839,7 +839,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -853,7 +853,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -867,7 +867,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by raziel_ in bug report #1891867
@@ -881,7 +881,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -895,7 +895,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by blackwhiteeagle in bug report #1605235
@@ -909,7 +909,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -923,7 +923,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by goodoldgeorg in bug report #2602017
@@ -937,7 +937,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -951,7 +951,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by arcepi in bug report #1659884
@@ -965,7 +965,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1133,7 +1133,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, "usa.tot", 0
},
{
@@ -1147,7 +1147,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1193,7 +1193,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1211,7 +1211,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1229,7 +1229,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1247,7 +1247,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1265,7 +1265,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1283,7 +1283,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Found in french ADI 2 Francais-Maths CM1
@@ -1297,7 +1297,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Found in french ADI 2.5 Anglais Multimedia 5e
@@ -1311,7 +1311,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by vampir_raziel in bug report #1658373
@@ -1435,7 +1435,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeWeen,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1449,7 +1449,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeWeen,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by cybot_tmin in bug report #1667743
@@ -1463,7 +1463,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeWeen,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1477,7 +1477,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeWeen,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by cartman_ on #scummvm
@@ -1491,7 +1491,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeWeen,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by glorfindel in bugreport #1722142
@@ -1505,7 +1505,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeWeen,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1519,7 +1519,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeWeen,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, "show.tot", 0
},
{
@@ -1533,7 +1533,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeWeen,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, "show.tot", 0
},
{
@@ -1645,7 +1645,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{
@@ -1659,7 +1659,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{
@@ -1673,7 +1673,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{
@@ -1687,7 +1687,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{
@@ -1701,7 +1701,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{
@@ -1733,7 +1733,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{
@@ -1747,7 +1747,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{
@@ -1761,7 +1761,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{
@@ -1775,7 +1775,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{
@@ -1789,7 +1789,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{ // Found in french ADI 2 Francais-Maths CM1
@@ -1803,7 +1803,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{ // Found in french ADI 2 Francais-Maths CM1
@@ -1817,7 +1817,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{ // Found in french ADI 2 Francais-Maths CM1
@@ -1831,7 +1831,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{ // Found in french ADI 2 Francais-Maths CM1
@@ -1845,7 +1845,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{ // Found in french ADI 2 Francais-Maths CM1
@@ -1859,7 +1859,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{
@@ -1873,7 +1873,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1887,7 +1887,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1901,7 +1901,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by cartman_ on #scummvm
@@ -1915,7 +1915,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by goodoldgeorg in bug report #2105220
@@ -1929,7 +1929,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by koalet in bug report #2479034
@@ -1947,7 +1947,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2129,7 +2129,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2143,7 +2143,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2157,7 +2157,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2171,7 +2171,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2185,7 +2185,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Found in french ADI 2.6 Francais-Maths 4e
@@ -2199,7 +2199,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2217,7 +2217,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2235,7 +2235,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2249,7 +2249,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2267,7 +2267,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2295,7 +2295,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeFascination,
- kFeaturesAdlib,
+ kFeaturesAdLib,
"disk0.stk", 0, 0
},
{
@@ -2309,7 +2309,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeFascination,
- kFeaturesAdlib,
+ kFeaturesAdLib,
"intro.stk", 0, 0
},
{ // Supplied by sanguine
@@ -2323,7 +2323,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeFascination,
- kFeaturesAdlib,
+ kFeaturesAdLib,
"disk0.stk", 0, 0
},
{ // Supplied by windlepoons in bug report #2809247
@@ -2337,7 +2337,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeFascination,
- kFeaturesAdlib,
+ kFeaturesAdLib,
"disk0.stk", 0, 0
},
{
@@ -2351,7 +2351,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeFascination,
- kFeaturesAdlib,
+ kFeaturesAdLib,
"disk0.stk", 0, 0
},
{
@@ -2449,7 +2449,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
"demo.stk", "demo.tot", 0
},
{
@@ -2463,7 +2463,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
"demo.stk", "demo.tot", 0
},
{
@@ -2477,7 +2477,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2491,7 +2491,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by raziel_ in bug report #1891869
@@ -2505,7 +2505,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2523,7 +2523,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2541,7 +2541,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2559,7 +2559,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by fac76 in bug report #1742716
@@ -2577,7 +2577,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2591,7 +2591,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by paul66 in bug report #1652352
@@ -2605,7 +2605,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2619,7 +2619,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by Paranoimia on #scummvm
@@ -2633,7 +2633,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2647,7 +2647,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2661,7 +2661,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by SiRoCs in bug report #2098621
@@ -2675,7 +2675,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2857,7 +2857,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2871,7 +2871,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2885,7 +2885,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2899,7 +2899,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2917,7 +2917,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2935,7 +2935,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2953,7 +2953,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Found in Found in french ADI 2.5 Anglais Multimedia 5e
@@ -2967,7 +2967,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -3051,7 +3051,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeInca2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -3065,7 +3065,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeInca2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -3079,7 +3079,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeInca2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -3093,7 +3093,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeInca2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -3107,7 +3107,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeInca2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -3121,7 +3121,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeInca2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -3135,7 +3135,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeInca2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -3149,7 +3149,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeInca2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -3176,7 +3176,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeInca2,
- kFeaturesAdlib | kFeaturesBATDemo,
+ kFeaturesAdLib | kFeaturesBATDemo,
0, 0, 7
},
{
@@ -4654,7 +4654,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ //3
@@ -4668,7 +4668,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ //4
@@ -4710,7 +4710,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ //7
@@ -4752,7 +4752,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ //10
@@ -4766,7 +4766,7 @@
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ //11
@@ -4962,7 +4962,7 @@
GUIO_NONE
},
kGameTypeUrban,
- kFeaturesAdlib | kFeatures640 | kFeaturesSCNDemo,
+ kFeaturesAdLib | kFeatures640 | kFeaturesSCNDemo,
"", "", 8
}
};
Modified: scummvm/trunk/engines/gob/gob.cpp
===================================================================
--- scummvm/trunk/engines/gob/gob.cpp 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/gob/gob.cpp 2010-01-12 21:07:56 UTC (rev 47279)
@@ -207,8 +207,8 @@
return (_features & kFeatures640) != 0;
}
-bool GobEngine::hasAdlib() const {
- return (_features & kFeaturesAdlib) != 0;
+bool GobEngine::hasAdLib() const {
+ return (_features & kFeaturesAdLib) != 0;
}
bool GobEngine::isSCNDemo() const {
Modified: scummvm/trunk/engines/gob/gob.h
===================================================================
--- scummvm/trunk/engines/gob/gob.h 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/gob/gob.h 2010-01-12 21:07:56 UTC (rev 47279)
@@ -121,7 +121,7 @@
kFeaturesNone = 0,
kFeaturesCD = 1 << 0,
kFeaturesEGA = 1 << 1,
- kFeaturesAdlib = 1 << 2,
+ kFeaturesAdLib = 1 << 2,
kFeatures640 = 1 << 3,
kFeaturesSCNDemo = 1 << 4,
kFeaturesBATDemo = 1 << 5,
@@ -208,7 +208,7 @@
bool isCD() const;
bool isEGA() const;
bool is640() const;
- bool hasAdlib() const;
+ bool hasAdLib() const;
bool isSCNDemo() const;
bool isBATDemo() const;
bool is800x600() const;
Modified: scummvm/trunk/engines/gob/sound/adlib.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/adlib.cpp 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/gob/sound/adlib.cpp 2010-01-12 21:07:56 UTC (rev 47279)
@@ -59,7 +59,7 @@
_rate = _mixer->getOutputRate();
- _opl = makeAdlibOPL(_rate);
+ _opl = makeAdLibOPL(_rate);
_first = true;
_ended = false;
Modified: scummvm/trunk/engines/gob/sound/sound.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/sound.cpp 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/gob/sound/sound.cpp 2010-01-12 21:07:56 UTC (rev 47279)
@@ -51,7 +51,7 @@
_cdrom = 0;
_bgatmos = 0;
- _hasAdLib = (!_vm->_noMusic && _vm->hasAdlib());
+ _hasAdLib = (!_vm->_noMusic && _vm->hasAdLib());
if (!_vm->_noMusic && (_vm->getPlatform() == Common::kPlatformAmiga)) {
_infogrames = new Infogrames(*_vm->_mixer);
@@ -130,13 +130,13 @@
return sndDesc->load(type, data, size);
}
-void Sound::sampleFree(SoundDesc *sndDesc, bool noteAdlib, int index) {
+void Sound::sampleFree(SoundDesc *sndDesc, bool noteAdLib, int index) {
if (!sndDesc || sndDesc->empty())
return;
if (sndDesc->getType() == SOUND_ADL) {
- if (noteAdlib) {
+ if (noteAdLib) {
if (_adlPlayer)
if ((index == -1) || (_adlPlayer->getIndex() == index))
_adlPlayer->stopPlay();
@@ -241,7 +241,7 @@
if (!_adlPlayer)
_adlPlayer = new ADLPlayer(*_vm->_mixer);
- debugC(1, kDebugSound, "Adlib: Loading ADL data (\"%s\")", fileName);
+ debugC(1, kDebugSound, "AdLib: Loading ADL data (\"%s\")", fileName);
return _adlPlayer->load(fileName);
}
@@ -253,7 +253,7 @@
if (!_adlPlayer)
_adlPlayer = new ADLPlayer(*_vm->_mixer);
- debugC(1, kDebugSound, "Adlib: Loading ADL data (%d)", index);
+ debugC(1, kDebugSound, "AdLib: Loading ADL data (%d)", index);
return _adlPlayer->load(data, size, index);
}
@@ -262,7 +262,7 @@
if (!_hasAdLib)
return;
- debugC(1, kDebugSound, "Adlib: Unloading data");
+ debugC(1, kDebugSound, "AdLib: Unloading data");
if (_adlPlayer)
_adlPlayer->unload();
@@ -277,7 +277,7 @@
if (!_mdyPlayer)
_mdyPlayer = new MDYPlayer(*_vm->_mixer);
- debugC(1, kDebugSound, "Adlib: Loading MDY data (\"%s\")", fileName);
+ debugC(1, kDebugSound, "AdLib: Loading MDY data (\"%s\")", fileName);
if (!_vm->_dataIO->existData(fileName)) {
warning("Can't open MDY file \"%s\"", fileName);
@@ -305,7 +305,7 @@
return false;
}
- debugC(1, kDebugSound, "Adlib: Loading MDY instruments (\"%s\")", fileName);
+ debugC(1, kDebugSound, "AdLib: Loading MDY instruments (\"%s\")", fileName);
DataStream *stream = _vm->_dataIO->getDataStream(fileName);
@@ -326,7 +326,7 @@
if (_adlPlayer->isPlaying())
return;
- debugC(1, kDebugSound, "Adlib: Playing ADL track \"%s\"", trackname);
+ debugC(1, kDebugSound, "AdLib: Playing ADL track \"%s\"", trackname);
_adlPlayer->unload();
_adlPlayer->load(trackname);
@@ -370,7 +370,7 @@
if (!_hasAdLib)
return;
- debugC(1, kDebugSound, "Adlib: Starting playback");
+ debugC(1, kDebugSound, "AdLib: Starting playback");
if (_adlPlayer)
_adlPlayer->startPlay();
@@ -382,7 +382,7 @@
if (!_hasAdLib)
return;
- debugC(1, kDebugSound, "Adlib: Stopping playback");
+ debugC(1, kDebugSound, "AdLib: Stopping playback");
if (_adlPlayer)
_adlPlayer->stopPlay();
Modified: scummvm/trunk/engines/gob/sound/sound.h
===================================================================
--- scummvm/trunk/engines/gob/sound/sound.h 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/gob/sound/sound.h 2010-01-12 21:07:56 UTC (rev 47279)
@@ -55,7 +55,7 @@
int sampleGetNextFreeSlot() const;
bool sampleLoad(SoundDesc *sndDesc, SoundType type, const char *fileName, bool tryExist = true);
- void sampleFree(SoundDesc *sndDesc, bool noteAdlib = false, int index = -1);
+ void sampleFree(SoundDesc *sndDesc, bool noteAdLib = false, int index = -1);
// SoundBlaster
Modified: scummvm/trunk/engines/groovie/music.cpp
===================================================================
--- scummvm/trunk/engines/groovie/music.cpp 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/groovie/music.cpp 2010-01-12 21:07:56 UTC (rev 47279)
@@ -558,7 +558,7 @@
// Prepare the AdLib Instrument array from the GTL entry
//
- // struct AdlibInstrument used by our AdLib MIDI synth is 30 bytes.
+ // struct AdLibInstrument used by our AdLib MIDI synth is 30 bytes.
// Since we pass data + 2 for non percussion instruments we need to
// have a buffer of size 32, so there are no invalid memory reads,
// when setting up an AdLib instrument.
Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp 2010-01-12 21:07:56 UTC (rev 47279)
@@ -120,7 +120,7 @@
} else if (_flags.platform == Common::kPlatformAmiga) {
_sound = new SoundAmiga(this, _mixer);
} else if (midiDriver == MD_ADLIB) {
- _sound = new SoundAdlibPC(this, _mixer);
+ _sound = new SoundAdLibPC(this, _mixer);
} else {
Sound::kType type;
@@ -149,9 +149,9 @@
// Unlike some SCUMM games, it's not that the MIDI sounds are
// missing. It's just that at least at the time of writing they
- // are decidedly inferior to the Adlib ones.
+ // are decidedly inferior to the AdLib ones.
if (ConfMan.getBool("multi_midi")) {
- SoundAdlibPC *adlib = new SoundAdlibPC(this, _mixer);
+ SoundAdLibPC *adlib = new SoundAdLibPC(this, _mixer);
assert(adlib);
_sound = new MixedSoundDriver(this, _mixer, soundMidiPc, adlib);
Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/kyra/lol.cpp 2010-01-12 21:07:56 UTC (rev 47279)
@@ -429,7 +429,7 @@
KyraEngine_v1::init();
initStaticResource();
- _envSfxDistThreshold = _sound->getSfxType() == Sound::kAdlib ? 15 : 3;
+ _envSfxDistThreshold = _sound->getSfxType() == Sound::kAdLib ? 15 : 3;
_gui = new GUI_LoL(this);
assert(_gui);
Modified: scummvm/trunk/engines/kyra/scene_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_hof.cpp 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/kyra/scene_hof.cpp 2010-01-12 21:07:56 UTC (rev 47279)
@@ -117,7 +117,7 @@
_sceneExit4 = scene.exit4;
if (newSoundFile) {
- if (_sound->getMusicType() == Sound::kAdlib) {
+ if (_sound->getMusicType() == Sound::kAdLib) {
while (_sound->isPlaying())
_system->delayMillis(10);
} else {
Modified: scummvm/trunk/engines/kyra/script_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_hof.cpp 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/kyra/script_hof.cpp 2010-01-12 21:07:56 UTC (rev 47279)
@@ -827,7 +827,7 @@
int KyraEngine_HoF::o2_playFireflyScore(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_playFireflyScore(%p) ()", (const void *)script);
- if (_sound->getSfxType() == Sound::kAdlib || _sound->getSfxType() == Sound::kPCSpkr ||
+ if (_sound->getSfxType() == Sound::kAdLib || _sound->getSfxType() == Sound::kPCSpkr ||
_sound->getSfxType() == Sound::kMidiMT32 || _sound->getSfxType() == Sound::kMidiGM) {
snd_playWanderScoreViaMap(86, 1);
return 1;
@@ -1329,7 +1329,7 @@
int KyraEngine_HoF::o2_getSfxDriver(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_getSfxDriver(%p) ()", (const void *)script);
- if (_sound->getSfxType() == Sound::kAdlib)
+ if (_sound->getSfxType() == Sound::kAdLib)
return 1;
else if (_sound->getSfxType() == Sound::kPCSpkr)
return 4;
@@ -1349,7 +1349,7 @@
int KyraEngine_HoF::o2_getMusicDriver(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_getMusicDriver(%p) ()", (const void *)script);
- if (_sound->getMusicType() == Sound::kAdlib)
+ if (_sound->getMusicType() == Sound::kAdLib)
return 1;
else if (_sound->getMusicType() == Sound::kPCSpkr)
return 4;
Modified: scummvm/trunk/engines/kyra/sound.h
===================================================================
--- scummvm/trunk/engines/kyra/sound.h 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/kyra/sound.h 2010-01-12 21:07:56 UTC (rev 47279)
@@ -51,7 +51,7 @@
virtual ~Sound();
enum kType {
- kAdlib,
+ kAdLib,
kMidiMT32,
kMidiGM,
kTowns,
Modified: scummvm/trunk/engines/kyra/sound_adlib.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_adlib.cpp 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/kyra/sound_adlib.cpp 2010-01-12 21:07:56 UTC (rev 47279)
@@ -49,17 +49,17 @@
#include "sound/fmopl.h"
#include "sound/audiostream.h"
-// Basic Adlib Programming:
+// Basic AdLib Programming:
// http://www.gamedev.net/reference/articles/article446.asp
#define CALLBACKS_PER_SECOND 72
namespace Kyra {
-class AdlibDriver : public Audio::AudioStream {
+class AdLibDriver : public Audio::AudioStream {
public:
- AdlibDriver(Audio::Mixer *mixer, bool v2);
- ~AdlibDriver();
+ AdLibDriver(Audio::Mixer *mixer, bool v2);
+ ~AdLibDriver();
int callback(int opcode, ...);
void callback();
@@ -96,7 +96,7 @@
private:
struct OpcodeEntry {
- typedef int (AdlibDriver::*DriverOpcode)(va_list &list);
+ typedef int (AdLibDriver::*DriverOpcode)(va_list &list);
DriverOpcode function;
const char *name;
};
@@ -176,7 +176,7 @@
uint8 position;
uint8 regAx;
uint8 regBx;
- typedef void (AdlibDriver::*Callback)(Channel&);
+ typedef void (AdLibDriver::*Callback)(Channel&);
Callback primaryEffect;
Callback secondaryEffect;
uint8 fractionalSpacing;
@@ -203,7 +203,7 @@
void primaryEffect2(Channel &channel);
void secondaryEffect1(Channel &channel);
- void resetAdlibState();
+ void resetAdLibState();
void writeOPL(byte reg, byte val);
void initChannel(Channel &channel);
void noteOff(Channel &channel);
@@ -236,7 +236,7 @@
uint8 *getProgram(int progId) {
uint16 offset = READ_LE_UINT16(_soundData + 2 * progId);
- //TODO: Check in LoL CD Adlib driver
+ //TODO: Check in LoL CD AdLib driver
if (offset == 0xFFFF)
return 0;
return _soundData + READ_LE_UINT16(_soundData + 2 * progId);
@@ -250,7 +250,7 @@
void executePrograms();
struct ParserOpcode {
- typedef int (AdlibDriver::*POpcode)(uint8 *&dataptr, Channel &channel, uint8 value);
+ typedef int (AdLibDriver::*POpcode)(uint8 *&dataptr, Channel &channel, uint8 value);
POpcode function;
const char *name;
};
@@ -269,7 +269,7 @@
int update_setBaseOctave(uint8 *&dataptr, Channel &channel, uint8 value);
int update_stopChannel(uint8 *&dataptr, Channel &channel, uint8 value);
int update_playRest(uint8 *&dataptr, Channel &channel, uint8 value);
- int update_writeAdlib(uint8 *&dataptr, Channel &channel, uint8 value);
+ int update_writeAdLib(uint8 *&dataptr, Channel &channel, uint8 value);
int update_setupNoteAndDuration(uint8 *&dataptr, Channel &channel, uint8 value);
int update_setBaseNote(uint8 *&dataptr, Channel &channel, uint8 value);
int update_setupSecondaryEffect1(uint8 *&dataptr, Channel &channel, uint8 value);
@@ -412,7 +412,7 @@
bool _v2;
};
-AdlibDriver::AdlibDriver(Audio::Mixer *mixer, bool v2) {
+AdLibDriver::AdLibDriver(Audio::Mixer *mixer, bool v2) {
setupOpcodeList();
setupParserOpcodeTable();
@@ -421,7 +421,7 @@
_mixer = mixer;
_flags = 0;
- _adlib = makeAdlibOPL(getRate());
+ _adlib = makeAdLibOPL(getRate());
assert(_adlib);
memset(_channels, 0, sizeof(_channels));
@@ -447,7 +447,7 @@
// HACK: We use MusicSoundType here for now so we can adjust the volume in the launcher dialog.
// This affects SFX too, but if we want to support different volumes for SFX and music we would
// have to change our player implementation, currently we setup the volume for an AdLib channel
- // in AdlibDriver::adjustVolume, so if that would be called, we would have to know if the channel
+ // in AdLibDriver::adjustVolume, so if that would be called, we would have to know if the channel
// is used by SFX or music, and then adjust the volume accordingly. Since Kyrandia 2 supports
// different volumes for SFX and music, looking at the disasm and checking how the original does it
// would be a good idea.
@@ -461,16 +461,16 @@
_syncJumpMask = 0;
}
-AdlibDriver::~AdlibDriver() {
+AdLibDriver::~AdLibDriver() {
_mixer->stopHandle(_soundHandle);
OPLDestroy(_adlib);
_adlib = 0;
}
-int AdlibDriver::callback(int opcode, ...) {
+int AdLibDriver::callback(int opcode, ...) {
Common::StackLock lock(_mutex);
if (opcode >= _opcodesEntries || opcode < 0) {
- warning("AdlibDriver: calling unknown opcode '%d'", opcode);
+ warning("AdLibDriver: calling unknown opcode '%d'", opcode);
return 0;
}
@@ -485,26 +485,26 @@
// Opcodes
-int AdlibDriver::snd_ret0x100(va_list &list) {
+int AdLibDriver::snd_ret0x100(va_list &list) {
return 0x100;
}
-int AdlibDriver::snd_ret0x1983(va_list &list) {
+int AdLibDriver::snd_ret0x1983(va_list &list) {
return 0x1983;
}
-int AdlibDriver::snd_initDriver(va_list &list) {
+int AdLibDriver::snd_initDriver(va_list &list) {
_lastProcessed = _soundsPlaying = 0;
- resetAdlibState();
+ resetAdLibState();
return 0;
}
-int AdlibDriver::snd_deinitDriver(va_list &list) {
- resetAdlibState();
+int AdLibDriver::snd_deinitDriver(va_list &list) {
+ resetAdLibState();
return 0;
}
-int AdlibDriver::snd_setSoundData(va_list &list) {
+int AdLibDriver::snd_setSoundData(va_list &list) {
if (_soundData) {
delete[] _soundData;
_soundData = 0;
@@ -513,12 +513,12 @@
return 0;
}
-int AdlibDriver::snd_unkOpcode1(va_list &list) {
+int AdLibDriver::snd_unkOpcode1(va_list &list) {
warning("unimplemented snd_unkOpcode1");
return 0;
}
-int AdlibDriver::snd_startSong(va_list &list) {
+int AdLibDriver::snd_startSong(va_list &list) {
int songId = va_arg(list, int);
_flags |= 8;
_flagTrigger = 1;
@@ -543,13 +543,13 @@
return 0;
}
-int AdlibDriver::snd_isChannelPlaying(va_list &list) {
+int AdLibDriver::snd_isChannelPlaying(va_list &list) {
int channel = va_arg(list, int);
assert(channel >= 0 && channel <= 9);
return (_channels[channel].dataptr != 0) ? 1 : 0;
}
-int AdlibDriver::snd_stopChannel(va_list &list) {
+int AdLibDriver::snd_stopChannel(va_list &list) {
int channel = va_arg(list, int);
int maxChannel;
@@ -574,7 +574,7 @@
return 0;
}
-int AdlibDriver::snd_readByte(va_list &list) {
+int AdLibDriver::snd_readByte(va_list &list) {
int a = va_arg(list, int);
int b = va_arg(list, int);
uint8 *ptr = getProgram(a) + b;
@@ -582,7 +582,7 @@
return *ptr;
}
-int AdlibDriver::snd_writeByte(va_list &list) {
+int AdLibDriver::snd_writeByte(va_list &list) {
int a = va_arg(list, int);
int b = va_arg(list, int);
uint8 value = va_arg(list, int);
@@ -592,36 +592,36 @@
return value;
}
-int AdlibDriver::snd_getSoundTrigger(va_list &list) {
+int AdLibDriver::snd_getSoundTrigger(va_list &list) {
return _soundTrigger;
}
-int AdlibDriver::snd_unkOpcode4(va_list &list) {
+int AdLibDriver::snd_unkOpcode4(va_list &list) {
warning("unimplemented snd_unkOpcode4");
return 0;
}
-int AdlibDriver::snd_dummy(va_list &list) {
+int AdLibDriver::snd_dummy(va_list &list) {
return 0;
}
-int AdlibDriver::snd_getNullvar4(va_list &list) {
+int AdLibDriver::snd_getNullvar4(va_list &list) {
warning("unimplemented snd_getNullvar4");
return 0;
}
-int AdlibDriver::snd_setNullvar3(va_list &list) {
+int AdLibDriver::snd_setNullvar3(va_list &list) {
warning("unimplemented snd_setNullvar3");
return 0;
}
-int AdlibDriver::snd_setFlag(va_list &list) {
+int AdLibDriver::snd_setFlag(va_list &list) {
int oldFlags = _flags;
_flags |= va_arg(list, int);
return oldFlags;
}
-int AdlibDriver::snd_clearFlag(va_list &list) {
+int AdLibDriver::snd_clearFlag(va_list &list) {
int oldFlags = _flags;
_flags &= ~(va_arg(list, int));
return oldFlags;
@@ -629,7 +629,7 @@
// timer callback
-void AdlibDriver::callback() {
+void AdLibDriver::callback() {
Common::StackLock lock(_mutex);
--_flagTrigger;
if (_flagTrigger < 0)
@@ -647,7 +647,7 @@
}
}
-void AdlibDriver::setupPrograms() {
+void AdLibDriver::setupPrograms() {
while (_lastProcessed != _soundsPlaying) {
uint8 *ptr = getProgram(_soundIdTable[_lastProcessed]);
uint8 chan = *ptr++;
@@ -712,9 +712,9 @@
// effects callbacks. The final opcode in a set can prevent this, if it's a
// function and it returns anything other than 1.
-void AdlibDriver::executePrograms() {
+void AdLibDriver::executePrograms() {
// Each channel runs its own program. There are ten channels: One for
- // each Adlib channel (0-8), plus one "control channel" (9) which is
+ // each AdLib channel (0-8), plus one "control channel" (9) which is
// the one that tells the other channels what to do.
// This is where we ensure that channels that are made to jump "in
@@ -812,8 +812,8 @@
//
-void AdlibDriver::resetAdlibState() {
- debugC(9, kDebugLevelSound, "resetAdlibState()");
+void AdLibDriver::resetAdLibState() {
+ debugC(9, kDebugLevelSound, "resetAdLibState()");
_rnd = 0x1234;
// Authorize the control of the waveforms
@@ -840,11 +840,11 @@
// Old calling style: output0x388(0xABCD)
// New calling style: writeOPL(0xAB, 0xCD)
-void AdlibDriver::writeOPL(byte reg, byte val) {
+void AdLibDriver::writeOPL(byte reg, byte val) {
OPLWriteReg(_adlib, reg, val);
}
-void AdlibDriver::initChannel(Channel &channel) {
+void AdLibDriver::initChannel(Channel &channel) {
debugC(9, kDebugLevelSound, "initChannel(%lu)", (long)(&channel - _channels));
memset(&channel.dataptr, 0, sizeof(Channel) - ((char *)&channel.dataptr - (char *)&channel));
@@ -857,10 +857,10 @@
channel.lock = false;
}
-void AdlibDriver::noteOff(Channel &channel) {
+void AdLibDriver::noteOff(Channel &channel) {
debugC(9, kDebugLevelSound, "noteOff(%lu)", (long)(&channel - _channels));
- // The control channel has no corresponding Adlib channel
+ // The control channel has no corresponding AdLib channel
if (_curChannel >= 9)
return;
@@ -877,16 +877,16 @@
writeOPL(0xB0 + _curChannel, channel.regBx);
}
-void AdlibDriver::unkOutput2(uint8 chan) {
+void AdLibDriver::unkOutput2(uint8 chan) {
debugC(9, kDebugLevelSound, "unkOutput2(%d)", chan);
- // The control channel has no corresponding Adlib channel
+ // The control channel has no corresponding AdLib channel
if (chan >= 9)
return;
// I believe this has to do with channels 6, 7, and 8 being special
- // when Adlib's rhythm section is enabled.
+ // when AdLib's rhythm section is enabled.
if (_rhythmSectionBits && chan >= 6)
return;
@@ -917,7 +917,7 @@
// problem, but cannot currently be used because of licensing and
// performance issues.
//
- // Ken Silverman's Adlib emulator (which can be found on his Web page -
+ // Ken Silverman's AdLib emulator (which can be found on his Web page -
// http://www.advsys.net/ken - and as part of AdPlug) also seems to be
// immune, but is apparently not as feature complete as MAME's.
@@ -928,7 +928,7 @@
// generate an even distribution of almost all numbers from 0 through 65535,
// though in my tests some numbers were never generated.
-uint16 AdlibDriver::getRandomNr() {
+uint16 AdLibDriver::getRandomNr() {
_rnd += 0x9248;
uint16 lowBits = _rnd & 7;
_rnd >>= 3;
@@ -936,7 +936,7 @@
return _rnd;
}
-void AdlibDriver::setupDuration(uint8 duration, Channel &channel) {
+void AdLibDriver::setupDuration(uint8 duration, Channel &channel) {
debugC(9, kDebugLevelSound, "setupDuration(%d, %lu)", duration, (long)(&channel - _channels));
if (channel.durationRandomness) {
channel.duration = duration + (getRandomNr() & channel.durationRandomness);
@@ -950,7 +950,7 @@
// This function may or may not play the note. It's usually followed by a call
// to noteOn(), which will always play the current note.
-void AdlibDriver::setupNote(uint8 rawNote, Channel &channel, bool flag) {
+void AdLibDriver::setupNote(uint8 rawNote, Channel &channel, bool flag) {
debugC(9, kDebugLevelSound, "setupNote(%d, %lu)", rawNote, (long)(&channel - _channels));
assert(_curChannel < 9);
@@ -1006,7 +1006,7 @@
writeOPL(0xB0 + _curChannel, channel.regBx);
}
-void AdlibDriver::setupInstrument(uint8 regOffset, uint8 *dataptr, Channel &channel) {
+void AdLibDriver::setupInstrument(uint8 regOffset, uint8 *dataptr, Channel &channel) {
debugC(9, kDebugLevelSound, "setupInstrument(%d, %p, %lu)", regOffset, (const void *)dataptr, (long)(&channel - _channels));
assert(_curChannel < 9);
@@ -1056,7 +1056,7 @@
// Apart from playing the note, this function also updates the variables for
// primary effect 2.
-void AdlibDriver::noteOn(Channel &channel) {
+void AdLibDriver::noteOn(Channel &channel) {
debugC(9, kDebugLevelSound, "noteOn(%lu)", (long)(&channel - _channels));
// The "note on" bit is set, and the current note is played.
@@ -1072,7 +1072,7 @@
channel.unk38 = channel.unk36;
}
-void AdlibDriver::adjustVolume(Channel &channel) {
+void AdLibDriver::adjustVolume(Channel &channel) {
debugC(9, kDebugLevelSound, "adjustVolume(%lu)", (long)(&channel - _channels));
assert(_curChannel < 9);
@@ -1100,7 +1100,7 @@
// unk30 - modifies the frequency
// unk31 - determines how often the notes are played
-void AdlibDriver::primaryEffect1(Channel &channel) {
+void AdLibDriver::primaryEffect1(Channel &channel) {
debugC(9, kDebugLevelSound, "Calling primaryEffect1 (channel: %d)", _curChannel);
assert(_curChannel < 9);
@@ -1186,7 +1186,7 @@
// Note that unk41 is never initialised. Not that it should matter much, but it
// is a bit sloppy.
-void AdlibDriver::primaryEffect2(Channel &channel) {
+void AdLibDriver::primaryEffect2(Channel &channel) {
debugC(9, kDebugLevelSound, "Calling primaryEffect2 (channel: %d)", _curChannel);
assert(_curChannel < 9);
@@ -1244,7 +1244,7 @@
// unk22 - the operation to perform
// offset - the offset to the data chunk
-void AdlibDriver::secondaryEffect1(Channel &channel) {
+void AdLibDriver::secondaryEffect1(Channel &channel) {
debugC(9, kDebugLevelSound, "Calling secondaryEffect1 (channel: %d)", _curChannel);
assert(_curChannel < 9);
@@ -1258,7 +1258,7 @@
}
}
-uint8 AdlibDriver::calculateOpLevel1(Channel &channel) {
+uint8 AdLibDriver::calculateOpLevel1(Channel &channel) {
int8 value = channel.opLevel1 & 0x3F;
if (channel.twoChan) {
@@ -1272,7 +1272,7 @@
return checkValue(value) | (channel.opLevel1 & 0xC0);
}
-uint8 AdlibDriver::calculateOpLevel2(Channel &channel) {
+uint8 AdLibDriver::calculateOpLevel2(Channel &channel) {
int8 value = channel.opLevel2 & 0x3F;
value += channel.opExtraLevel1;
@@ -1286,12 +1286,12 @@
// parser opcodes
-int AdlibDriver::update_setRepeat(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setRepeat(uint8 *&dataptr, Channel &channel, uint8 value) {
channel.repeatCounter = value;
return 0;
}
-int AdlibDriver::update_checkRepeat(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_checkRepeat(uint8 *&dataptr, Channel &channel, uint8 value) {
++dataptr;
if (--channel.repeatCounter) {
int16 add = READ_LE_UINT16(dataptr - 2);
@@ -1300,12 +1300,12 @@
return 0;
}
-int AdlibDriver::update_setupProgram(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setupProgram(uint8 *&dataptr, Channel &channel, uint8 value) {
if (value == 0xFF)
return 0;
uint8 *ptr = getProgram(value);
- //TODO: Check in LoL CD Adlib driver
+ //TODO: Check in LoL CD AdLib driver
if (!ptr)
return 0;
uint8 chan = *ptr++;
@@ -1328,12 +1328,12 @@
return 0;
}
-int AdlibDriver::update_setNoteSpacing(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setNoteSpacing(uint8 *&dataptr, Channel &channel, uint8 value) {
channel.spacing1 = value;
return 0;
}
-int AdlibDriver::update_jump(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_jump(uint8 *&dataptr, Channel &channel, uint8 value) {
--dataptr;
int16 add = READ_LE_UINT16(dataptr); dataptr += 2;
dataptr += add;
@@ -1342,7 +1342,7 @@
return 0;
}
-int AdlibDriver::update_jumpToSubroutine(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_jumpToSubroutine(uint8 *&dataptr, Channel &channel, uint8 value) {
--dataptr;
int16 add = READ_LE_UINT16(dataptr); dataptr += 2;
channel.dataptrStack[channel.dataptrStackPos++] = dataptr;
@@ -1350,17 +1350,17 @@
return 0;
}
-int AdlibDriver::update_returnFromSubroutine(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_returnFromSubroutine(uint8 *&dataptr, Channel &channel, uint8 value) {
dataptr = channel.dataptrStack[--channel.dataptrStackPos];
return 0;
}
-int AdlibDriver::update_setBaseOctave(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setBaseOctave(uint8 *&dataptr, Channel &channel, uint8 value) {
channel.baseOctave = value;
return 0;
}
-int AdlibDriver::update_stopChannel(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_stopChannel(uint8 *&dataptr, Channel &channel, uint8 value) {
channel.priority = 0;
if (_curChannel != 9)
noteOff(channel);
@@ -1368,40 +1368,40 @@
return 2;
}
-int AdlibDriver::update_playRest(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_playRest(uint8 *&dataptr, Channel &channel, uint8 value) {
setupDuration(value, channel);
noteOff(channel);
return (value != 0);
}
-int AdlibDriver::update_writeAdlib(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_writeAdLib(uint8 *&dataptr, Channel &channel, uint8 value) {
writeOPL(value, *dataptr++);
return 0;
}
-int AdlibDriver::update_setupNoteAndDuration(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setupNoteAndDuration(uint8 *&dataptr, Channel &channel, uint8 value) {
setupNote(value, channel);
value = *dataptr++;
setupDuration(value, channel);
return (value != 0);
}
-int AdlibDriver::update_setBaseNote(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setBaseNote(uint8 *&dataptr, Channel &channel, uint8 value) {
channel.baseNote = value;
return 0;
}
-int AdlibDriver::update_setupSecondaryEffect1(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setupSecondaryEffect1(uint8 *&dataptr, Channel &channel, uint8 value) {
channel.unk18 = value;
channel.unk19 = value;
channel.unk20 = channel.unk21 = *dataptr++;
channel.unk22 = *dataptr++;
channel.offset = READ_LE_UINT16(dataptr); dataptr += 2;
- channel.secondaryEffect = &AdlibDriver::secondaryEffect1;
+ channel.secondaryEffect = &AdLibDriver::secondaryEffect1;
return 0;
}
-int AdlibDriver::update_stopOtherChannel(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_stopOtherChannel(uint8 *&dataptr, Channel &channel, uint8 value) {
Channel &channel2 = _channels[value];
channel2.duration = 0;
channel2.priority = 0;
@@ -1409,7 +1409,7 @@
return 0;
}
-int AdlibDriver::update_waitForEndOfProgram(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_waitForEndOfProgram(uint8 *&dataptr, Channel &channel, uint8 value) {
uint8 *ptr = getProgram(value);
uint8 chan = *ptr;
@@ -1420,49 +1420,49 @@
return 2;
}
-int AdlibDriver::update_setupInstrument(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setupInstrument(uint8 *&dataptr, Channel &channel, uint8 value) {
setupInstrument(_curRegOffset, getInstrument(value), channel);
return 0;
}
-int AdlibDriver::update_setupPrimaryEffect1(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setupPrimaryEffect1(uint8 *&dataptr, Channel &channel, uint8 value) {
channel.unk29 = value;
channel.unk30 = READ_BE_UINT16(dataptr);
dataptr += 2;
- channel.primaryEffect = &AdlibDriver::primaryEffect1;
+ channel.primaryEffect = &AdLibDriver::primaryEffect1;
channel.unk31 = 0xFF;
return 0;
}
-int AdlibDriver::update_removePrimaryEffect1(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_removePrimaryEffect1(uint8 *&dataptr, Channel &channel, uint8 value) {
--dataptr;
channel.primaryEffect = 0;
channel.unk30 = 0;
return 0;
}
-int AdlibDriver::update_setBaseFreq(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setBaseFreq(uint8 *&dataptr, Channel &channel, uint8 value) {
channel.baseFreq = value;
return 0;
}
-int AdlibDriver::update_setupPrimaryEffect2(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setupPrimaryEffect2(uint8 *&dataptr, Channel &channel, uint8 value) {
channel.unk32 = value;
channel.unk33 = *dataptr++;
uint8 temp = *dataptr++;
channel.unk34 = temp + 1;
channel.unk35 = temp << 1;
channel.unk36 = *dataptr++;
- channel.primaryEffect = &AdlibDriver::primaryEffect2;
+ channel.primaryEffect = &AdLibDriver::primaryEffect2;
return 0;
}
-int AdlibDriver::update_setPriority(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setPriority(uint8 *&dataptr, Channel &channel, uint8 value) {
channel.priority = value;
return 0;
}
-int AdlibDriver::updateCallback23(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::updateCallback23(uint8 *&dataptr, Channel &channel, uint8 value) {
value >>= 1;
_unkValue1 = _unkValue2 = value;
_unkValue3 = 0xFF;
@@ -1470,7 +1470,7 @@
return 0;
}
-int AdlibDriver::updateCallback24(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::updateCallback24(uint8 *&dataptr, Channel &channel, uint8 value) {
if (_unkValue5) {
if (_unkValue4 & value) {
_unkValue5 = 0;
@@ -1486,50 +1486,50 @@
return 2;
}
-int AdlibDriver::update_setExtraLevel1(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setExtraLevel1(uint8 *&dataptr, Channel &channel, uint8 value) {
channel.opExtraLevel1 = value;
adjustVolume(channel);
return 0;
}
-int AdlibDriver::update_setupDuration(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setupDuration(uint8 *&dataptr, Channel &channel, uint8 value) {
setupDuration(value, channel);
return (value != 0);
}
-int AdlibDriver::update_playNote(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_playNote(uint8 *&dataptr, Channel &channel, uint8 value) {
setupDuration(value, channel);
noteOn(channel);
return (value != 0);
}
-int AdlibDriver::update_setFractionalNoteSpacing(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setFractionalNoteSpacing(uint8 *&dataptr, Channel &channel, uint8 value) {
channel.fractionalSpacing = value & 7;
return 0;
}
-int AdlibDriver::update_setTempo(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setTempo(uint8 *&dataptr, Channel &channel, uint8 value) {
_tempo = value;
return 0;
}
-int AdlibDriver::update_removeSecondaryEffect1(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_removeSecondaryEffect1(uint8 *&dataptr, Channel &channel, uint8 value) {
--dataptr;
channel.secondaryEffect = 0;
return 0;
}
-int AdlibDriver::update_setChannelTempo(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setChannelTempo(uint8 *&dataptr, Channel &channel, uint8 value) {
channel.tempo = value;
return 0;
}
-int AdlibDriver::update_setExtraLevel3(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setExtraLevel3(uint8 *&dataptr, Channel &channel, uint8 value) {
channel.opExtraLevel3 = value;
return 0;
}
-int AdlibDriver::update_setExtraLevel2(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setExtraLevel2(uint8 *&dataptr, Channel &channel, uint8 value) {
int channelBackUp = _curChannel;
_curChannel = value;
@@ -1541,7 +1541,7 @@
return 0;
}
-int AdlibDriver::update_changeExtraLevel2(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_changeExtraLevel2(uint8 *&dataptr, Channel &channel, uint8 value) {
int channelBackUp = _curChannel;
_curChannel = value;
@@ -1556,7 +1556,7 @@
// Apart from initialising to zero, these two functions are the only ones that
// modify _vibratoAndAMDepthBits.
-int AdlibDriver::update_setAMDepth(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setAMDepth(uint8 *&dataptr, Channel &channel, uint8 value) {
if (value & 1)
_vibratoAndAMDepthBits |= 0x80;
else
@@ -1566,7 +1566,7 @@
return 0;
}
-int AdlibDriver::update_setVibratoDepth(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setVibratoDepth(uint8 *&dataptr, Channel &channel, uint8 value) {
if (value & 1)
_vibratoAndAMDepthBits |= 0x40;
else
@@ -1576,13 +1576,13 @@
return 0;
}
-int AdlibDriver::update_changeExtraLevel1(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_changeExtraLevel1(uint8 *&dataptr, Channel &channel, uint8 value) {
channel.opExtraLevel1 += value;
adjustVolume(channel);
return 0;
}
-int AdlibDriver::updateCallback38(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::updateCallback38(uint8 *&dataptr, Channel &channel, uint8 value) {
int channelBackUp = _curChannel;
_curChannel = value;
@@ -1611,7 +1611,7 @@
return 0;
}
-int AdlibDriver::updateCallback39(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::updateCallback39(uint8 *&dataptr, Channel &channel, uint8 value) {
assert(_curChannel < 9);
uint16 unk = *dataptr++;
@@ -1631,35 +1631,35 @@
return 0;
}
-int AdlibDriver::update_removePrimaryEffect2(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_removePrimaryEffect2(uint8 *&dataptr, Channel &channel, uint8 value) {
--dataptr;
channel.primaryEffect = 0;
return 0;
}
-int AdlibDriver::updateCallback41(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::updateCallback41(uint8 *&dataptr, Channel &channel, uint8 value) {
channel.unk16 = value;
setupNote(channel.rawNote, channel, true);
return 0;
}
-int AdlibDriver::update_resetToGlobalTempo(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_resetToGlobalTempo(uint8 *&dataptr, Channel &channel, uint8 value) {
--dataptr;
channel.tempo = _tempo;
return 0;
}
-int AdlibDriver::update_nop(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_nop(uint8 *&dataptr, Channel &channel, uint8 value) {
--dataptr;
return 0;
}
-int AdlibDriver::update_setDurationRandomness(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setDurationRandomness(uint8 *&dataptr, Channel &channel, uint8 value) {
channel.durationRandomness = value;
return 0;
}
-int AdlibDriver::update_changeChannelTempo(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_changeChannelTempo(uint8 *&dataptr, Channel &channel, uint8 value) {
int tempo = channel.tempo + (int8)value;
if (tempo <= 0)
@@ -1671,7 +1671,7 @@
return 0;
}
-int AdlibDriver::updateCallback46(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::updateCallback46(uint8 *&dataptr, Channel &channel, uint8 value) {
uint8 entry = *dataptr++;
_tablePtr1 = _unkTable2[entry++];
_tablePtr2 = _unkTable2[entry];
@@ -1682,7 +1682,7 @@
return 0;
}
-int AdlibDriver::update_setupRhythmSection(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setupRhythmSection(uint8 *&dataptr, Channel &channel, uint8 value) {
int channelBackUp = _curChannel;
int regOffsetBackUp = _curRegOffset;
@@ -1727,7 +1727,7 @@
return 0;
}
-int AdlibDriver::update_playRhythmSection(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_playRhythmSection(uint8 *&dataptr, Channel &channel, uint8 value) {
// Any instrument that we want to play, and which was already playing,
// is temporarily keyed off. Instruments that were off already, or
// which we don't want to play, retain their old on/off status. This is
@@ -1747,7 +1747,7 @@
return 0;
}
-int AdlibDriver::update_removeRhythmSection(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_removeRhythmSection(uint8 *&dataptr, Channel &channel, uint8 value) {
--dataptr;
_rhythmSectionBits = 0;
@@ -1758,7 +1758,7 @@
return 0;
}
-int AdlibDriver::updateCallback51(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::updateCallback51(uint8 *&dataptr, Channel &channel, uint8 value) {
uint8 value2 = *dataptr++;
if (value & 1) {
@@ -1799,7 +1799,7 @@
return 0;
}
-int AdlibDriver::updateCallback52(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::updateCallback52(uint8 *&dataptr, Channel &channel, uint8 value) {
uint8 value2 = *dataptr++;
if (value & 1) {
@@ -1840,7 +1840,7 @@
return 0;
}
-int AdlibDriver::updateCallback53(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::updateCallback53(uint8 *&dataptr, Channel &channel, uint8 value) {
uint8 value2 = *dataptr++;
if (value & 1) {
@@ -1881,17 +1881,17 @@
return 0;
}
-int AdlibDriver::update_setSoundTrigger(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setSoundTrigger(uint8 *&dataptr, Channel &channel, uint8 value) {
_soundTrigger = value;
return 0;
}
-int AdlibDriver::update_setTempoReset(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::update_setTempoReset(uint8 *&dataptr, Channel &channel, uint8 value) {
channel.tempoReset = value;
return 0;
}
-int AdlibDriver::updateCallback56(uint8 *&dataptr, Channel &channel, uint8 value) {
+int AdLibDriver::updateCallback56(uint8 *&dataptr, Channel &channel, uint8 value) {
channel.unk39 = value;
channel.unk40 = *dataptr++;
return 0;
@@ -1899,9 +1899,9 @@
// static res
-#define COMMAND(x) { &AdlibDriver::x, #x }
+#define COMMAND(x) { &AdLibDriver::x, #x }
-void AdlibDriver::setupOpcodeList() {
+void AdLibDriver::setupOpcodeList() {
static const OpcodeEntry opcodeList[] = {
COMMAND(snd_ret0x100),
COMMAND(snd_ret0x1983),
@@ -1927,7 +1927,7 @@
_opcodesEntries = ARRAYSIZE(opcodeList);
}
-void AdlibDriver::setupParserOpcodeTable() {
+void AdLibDriver::setupParserOpcodeTable() {
static const ParserOpcode parserOpcodeTable[] = {
// 0
COMMAND(update_setRepeat),
@@ -1944,7 +1944,7 @@
// 8
COMMAND(update_stopChannel),
COMMAND(update_playRest),
- COMMAND(update_writeAdlib),
+ COMMAND(update_writeAdLib),
COMMAND(update_setupNoteAndDuration),
// 12
@@ -2051,16 +2051,16 @@
// This table holds the register offset for operator 1 for each of the nine
// channels. To get the register offset for operator 2, simply add 3.
-const uint8 AdlibDriver::_regOffset[] = {
+const uint8 AdLibDriver::_regOffset[] = {
0x00, 0x01, 0x02, 0x08, 0x09, 0x0A, 0x10, 0x11,
0x12
};
// Given the size of this table, and the range of its values, it's probably the
// F-Numbers (10 bits) for the notes of the 12-tone scale. However, it does not
-// match the table in the Adlib documentation I've seen.
+// match the table in the AdLib documentation I've seen.
-const uint16 AdlibDriver::_unkTable[] = {
+const uint16 AdLibDriver::_unkTable[] = {
0x0134, 0x0147, 0x015A, 0x016F, 0x0184, 0x019C, 0x01B4, 0x01CE, 0x01E9,
0x0207, 0x0225, 0x0246
};
@@ -2068,16 +2068,16 @@
// These tables are currently only used by updateCallback46(), which only ever
// uses the first element of one of the sub-tables.
-const uint8 *AdlibDriver::_unkTable2[] = {
- AdlibDriver::_unkTable2_1,
- AdlibDriver::_unkTable2_2,
- AdlibDriver::_unkTable2_1,
- AdlibDriver::_unkTable2_2,
- AdlibDriver::_unkTable2_3,
- AdlibDriver::_unkTable2_2
+const uint8 *AdLibDriver::_unkTable2[] = {
+ AdLibDriver::_unkTable2_1,
+ AdLibDriver::_unkTable2_2,
+ AdLibDriver::_unkTable2_1,
+ AdLibDriver::_unkTable2_2,
+ AdLibDriver::_unkTable2_3,
+ AdLibDriver::_unkTable2_2
};
-const uint8 AdlibDriver::_unkTable2_1[] = {
+const uint8 AdLibDriver::_unkTable2_1[] = {
0x50, 0x50, 0x4F, 0x4F, 0x4E, 0x4E, 0x4D, 0x4D,
0x4C, 0x4C, 0x4B, 0x4B, 0x4A, 0x4A, 0x49, 0x49,
0x48, 0x48, 0x47, 0x47, 0x46, 0x46, 0x45, 0x45,
@@ -2098,7 +2098,7 @@
};
// no don't ask me WHY this table exsits!
-const uint8 AdlibDriver::_unkTable2_2[] = {
+const uint8 AdLibDriver::_unkTable2_2[] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
@@ -2117,7 +2117,7 @@
0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F
};
-const uint8 AdlibDriver::_unkTable2_3[] = {
+const uint8 AdLibDriver::_unkTable2_3[] = {
0x40, 0x40, 0x40, 0x3F, 0x3F, 0x3F, 0x3E, 0x3E,
0x3E, 0x3D, 0x3D, 0x3D, 0x3C, 0x3C, 0x3C, 0x3B,
0x3B, 0x3B, 0x3A, 0x3A, 0x3A, 0x39, 0x39, 0x39,
@@ -2144,7 +2144,7 @@
// This could be some sort of pitch bend, but I have yet to see it used for
// anything so it's hard to say.
-const uint8 AdlibDriver::_unkTables[][32] = {
+const uint8 AdLibDriver::_unkTables[][32] = {
// 0
{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x08,
0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10,
@@ -2224,17 +2224,17 @@
// used in other places throughout the game, but the player is less likely to
// spend enough time there to notice.
-const int SoundAdlibPC::_kyra1SoundTriggers[] = {
+const int SoundAdLibPC::_kyra1SoundTriggers[] = {
0, 4, 5, 3
};
-const int SoundAdlibPC::_kyra1NumSoundTriggers = ARRAYSIZE(SoundAdlibPC::_kyra1SoundTriggers);
+const int SoundAdLibPC::_kyra1NumSoundTriggers = ARRAYSIZE(SoundAdLibPC::_kyra1SoundTriggers);
-SoundAdlibPC::SoundAdlibPC(KyraEngine_v1 *vm, Audio::Mixer *mixer)
+SoundAdLibPC::SoundAdLibPC(KyraEngine_v1 *vm, Audio::Mixer *mixer)
: Sound(vm, mixer), _driver(0), _trackEntries(), _soundDataPtr(0) {
memset(_trackEntries, 0, sizeof(_trackEntries));
_v2 = (_vm->gameFlags().gameID == GI_KYRA2) || (_vm->gameFlags().gameID == GI_LOL && !_vm->gameFlags().isDemo);
- _driver = new AdlibDriver(mixer, _v2);
+ _driver = new AdLibDriver(mixer, _v2);
assert(_driver);
_sfxPlayingSound = -1;
@@ -2250,18 +2250,18 @@
}
}
-SoundAdlibPC::~SoundAdlibPC() {
+SoundAdLibPC::~SoundAdLibPC() {
delete _driver;
delete[] _soundDataPtr;
}
-bool SoundAdlibPC::init() {
+bool SoundAdLibPC::init() {
_driver->callback(2);
_driver->callback(16, int(4));
return true;
}
-void SoundAdlibPC::process() {
+void SoundAdLibPC::process() {
uint8 trigger = _driver->callback(11);
if (trigger < _numSoundTriggers) {
@@ -2275,7 +2275,7 @@
}
}
-void SoundAdlibPC::playTrack(uint8 track) {
+void SoundAdLibPC::playTrack(uint8 track) {
if (_musicEnabled) {
// WORKAROUND: There is a bug in the Kyra 1 "Pool of Sorrow"
// music which causes the channels to get progressively out of
@@ -2290,22 +2290,22 @@
}
}
-void SoundAdlibPC::haltTrack() {
+void SoundAdLibPC::haltTrack() {
unk1();
unk2();
//_vm->_system->delayMillis(3 * 60);
}
-bool SoundAdlibPC::isPlaying() {
+bool SoundAdLibPC::isPlaying() {
return _driver->callback(7, int(0)) != 0;
}
-void SoundAdlibPC::playSoundEffect(uint8 track) {
+void SoundAdLibPC::playSoundEffect(uint8 track) {
if (_sfxEnabled)
play(track);
}
-void SoundAdlibPC::play(uint8 track) {
+void SoundAdLibPC::play(uint8 track) {
uint16 soundId = 0;
if (_v2)
@@ -2368,19 +2368,19 @@
_driver->callback(6, soundId);
}
-void SoundAdlibPC::beginFadeOut() {
+void SoundAdLibPC::beginFadeOut() {
playSoundEffect(1);
}
-void SoundAdlibPC::loadSoundFile(uint file) {
+void SoundAdLibPC::loadSoundFile(uint file) {
internalLoadFile(fileListEntry(file));
}
-void SoundAdlibPC::loadSoundFile(Common::String file) {
+void SoundAdLibPC::loadSoundFile(Common::String file) {
internalLoadFile(file);
}
-void SoundAdlibPC::internalLoadFile(Common::String file) {
+void SoundAdLibPC::internalLoadFile(Common::String file) {
file += ".ADL";
if (_soundFileLoaded == file)
return;
@@ -2429,12 +2429,12 @@
_soundFileLoaded = file;
}
-void SoundAdlibPC::unk1() {
+void SoundAdLibPC::unk1() {
playSoundEffect(0);
//_vm->_system->delayMillis(5 * 60);
}
-void SoundAdlibPC::unk2() {
+void SoundAdLibPC::unk2() {
playSoundEffect(0);
}
Modified: scummvm/trunk/engines/kyra/sound_adlib.h
===================================================================
--- scummvm/trunk/engines/kyra/sound_adlib.h 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/kyra/sound_adlib.h 2010-01-12 21:07:56 UTC (rev 47279)
@@ -47,7 +47,7 @@
#include "common/mutex.h"
namespace Kyra {
-class AdlibDriver;
+class AdLibDriver;
/**
* AdLib implementation of the sound output device.
@@ -57,15 +57,15 @@
* Kyrandia 1 are using exact the same format, the
* one of Kyrandia 2 slightly differs.
*
- * See AdlibDriver for more information.
- * @see AdlibDriver
+ * See AdLibDriver for more information.
+ * @see AdLibDriver
*/
-class SoundAdlibPC : public Sound {
+class SoundAdLibPC : public Sound {
public:
- SoundAdlibPC(KyraEngine_v1 *vm, Audio::Mixer *mixer);
- ~SoundAdlibPC();
+ SoundAdLibPC(KyraEngine_v1 *vm, Audio::Mixer *mixer);
+ ~SoundAdLibPC();
- kType getMusicType() const { return kAdlib; }
+ kType getMusicType() const { return kAdLib; }
bool init();
void process();
@@ -89,7 +89,7 @@
void unk1();
void unk2();
- AdlibDriver *_driver;
+ AdLibDriver *_driver;
bool _v2;
uint8 _trackEntries[500];
Modified: scummvm/trunk/engines/m4/mads_anim.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_anim.cpp 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/m4/mads_anim.cpp 2010-01-12 21:07:56 UTC (rev 47279)
@@ -577,7 +577,7 @@
{
char buffer[100];
strcpy(buffer, aaFile.soundName.c_str());
- buffer[0] = 'A'; // A for Adlib resource
+ buffer[0] = 'A'; // A for AdLib resource
/*Common::SeekableReadStream *stream = */_vm->_resourceManager->get(buffer);
Modified: scummvm/trunk/engines/made/made.cpp
===================================================================
--- scummvm/trunk/engines/made/made.cpp 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/made/made.cpp 2010-01-12 21:07:56 UTC (rev 47279)
@@ -105,7 +105,7 @@
_music = new MusicPlayer(driver);
_music->setNativeMT32(native_mt32);
- //_music->setAdlib(adlib);
+ //_music->setAdLib(adlib);
// Set default sound frequency
switch (getGameID()) {
Modified: scummvm/trunk/engines/queen/midiadlib.cpp
===================================================================
--- scummvm/trunk/engines/queen/midiadlib.cpp 2010-01-12 20:51:45 UTC (rev 47278)
+++ scummvm/trunk/engines/queen/midiadlib.cpp 2010-01-12 21:07:56 UTC (rev 47279)
@@ -30,13 +30,13 @@
namespace Queen {
-class AdlibMidiChannel;
+class AdLibMidiChannel;
-class AdlibMidiDriver : public MidiDriver_Emulated {
+class AdLibMidiDriver : public MidiDriver_Emulated {
public:
- AdlibMidiDriver(Audio::Mixer *mixer) : MidiDriver_Emulated(mixer) {}
- ~AdlibMidiDriver() {}
+ AdLibMidiDriver(Audio::Mixer *mixer) : MidiDriver_Emulated(mixer) {}
+ ~AdLibMidiDriver() {}
// MidiDriver
int open();
@@ -123,9 +123,9 @@
static const int16 _midiNoteFreqTable[];
};
-int AdlibMidiDriver::open() {
+int AdLibMidiDriver::open() {
MidiDriver_Emulated::open();
- _opl = makeAdlibOPL(getRate());
+ _opl = makeAdLibOPL(getRate());
adlibSetupCard();
for (int i = 0; i < 11; ++i) {
_adlibChannelsVolume[i] = 0;
@@ -136,12 +136,12 @@
return 0;
}
-void AdlibMidiDriver::close() {
+void AdLibMidiDriver::close() {
_mixer->stopHandle(_mixerSoundHandle);
OPLDestroy(_opl);
}
-void AdlibMidiDriver::send(uint32 b) {
+void AdLibMidiDriver::send(uint32 b) {
int channel = b & 15;
int cmd = (b >> 4) & 7;
int param1 = (b >> 8) & 255;
@@ -168,7 +168,7 @@
}
}
-void AdlibMidiDriver::metaEvent(byte type, byte *data, uint16 length) {
+void AdLibMidiDriver::metaEvent(byte type, byte *data, uint16 length) {
int event = 0;
if (length > 4 && READ_BE_UINT32(data) == 0x3F00) {
event = data[4];
@@ -196,12 +196,12 @@
warning("Unhandled meta event %d len %d", event, length);
}
-void AdlibMidiDriver::generateSamples(int16 *data, int len) {
+void AdLibMidiDriver::generateSamples(int16 *data, int len) {
memset(data, 0, sizeof(int16) * len);
YM3812UpdateOne(_opl, data, len);
}
-void AdlibMidiDriver::handleSequencerSpecificMetaEvent1(int channel, const uint8 *data) {
+void AdLibMidiDriver::handleSequencerSpecificMetaEvent1(int channel, const uint8 *data) {
for (int i = 0; i < 28; ++i) {
_adlibMetaSequenceData[i] = data[i];
}
@@ -219,17 +219,17 @@
}
}
-void AdlibMidiDriver::handleSequencerSpecificMetaEvent2(uint8 value) {
+void AdLibMidiDriver::handleSequencerSpecificMetaEvent2(uint8 value) {
_adlibRhythmEnabled = value;
_midiNumberOfChannels = _adlibRhythmEnabled ? 11 : 9;
adlibSetAmpVibratoRhythm();
}
-void AdlibMidiDriver::handleSequencerSpecificMetaEvent3(uint8 value) {
+void AdLibMidiDriver::handleSequencerSpecificMetaEvent3(uint8 value) {
adlibSetNoteMul(value);
}
-void AdlibMidiDriver::handleMidiEvent0x90_NoteOn(int channel, int param1, int param2) { // note, volume
+void AdLibMidiDriver::handleMidiEvent0x90_NoteOn(int channel, int param1, int param2) { // note, volume
if (param2 == 0) {
adlibTurnNoteOff(channel);
_adlibChannelsVolume[channel] = param2;
@@ -241,11 +241,11 @@
}
}
-void AdlibMidiDriver::adlibWrite(uint8 port, uint8 value) {
+void AdLibMidiDriver::adlibWrite(uint8 port, uint8 value) {
OPLWriteReg(_opl, port, value);
}
-void AdlibMidiDriver::adlibSetupCard() {
+void AdLibMidiDriver::adlibSetupCard() {
for (int i = 1; i <= 0xF5; ++i) {
adlibWrite(i, 0);
}
@@ -263,7 +263,7 @@
adlibSetWaveformSelect(1);
}
-void AdlibMidiDriver::adlibSetupChannels(int fl) {
+void AdLibMidiDriver::adlibSetupChannels(int fl) {
if (fl != 0) {
_midiChannelsNote1Table[8] = 24;
_midiChannelsNote2Table[8] = 8192;
@@ -282,7 +282,7 @@
adlibSetAmpVibratoRhythm();
}
-void AdlibMidiDriver::adlibResetAmpVibratoRhythm(int am, int vib, int kso) {
+void AdLibMidiDriver::adlibResetAmpVibratoRhythm(int am, int vib, int kso) {
_adlibAMDepthEq48 = am;
_adlibVibratoDepthEq14 = vib;
_adlibKeyboardSplitOn = kso;
@@ -290,7 +290,7 @@
adlibSetCSMKeyboardSplit();
}
-void AdlibMidiDriver::adlibResetChannels() {
+void AdLibMidiDriver::adlibResetChannels() {
for (int i = 0; i < 18; ++i) {
adlibSetupChannelFromSequence(i, _adlibChannelsNoFeedback[i] ? _adlibInitSequenceData2 : _adlibInitSequenceData1, 0);
}
@@ -304,7 +304,7 @@
}
}
-void AdlibMidiDriver::adlibSetAmpVibratoRhythm() {
+void AdLibMidiDriver::adlibSetAmpVibratoRhythm() {
uint8 value = 0;
if (_adlibAMDepthEq48) {
value |= 0x80;
@@ -318,12 +318,12 @@
adlibWrite(0xBD, value | _adlibVibratoRhythm);
}
-void AdlibMidiDriver::adlibSetCSMKeyboardSplit() {
+void AdLibMidiDriver::adlibSetCSMKeyboardSplit() {
uint8 value = _adlibKeyboardSplitOn ? 0x40 : 0;
adlibWrite(8, value);
}
-void AdlibMidiDriver::adlibSetNoteMul(int mul) {
+void AdLibMidiDriver::adlibSetNoteMul(int mul) {
if (mul > 12) {
mul = 12;
} else if (mul < 1) {
@@ -332,7 +332,7 @@
_adlibNoteMul = mul;
}
-void AdlibMidiDriver::adlibSetWaveformSelect(int fl) {
+void AdLibMidiDriver::adlibSetWaveformSelect(int fl) {
_adlibWaveformSelect = fl ? 0x20 : 0;
for (int i = 0; i < 18; ++i) {
adlibWrite(0xE0 + _adlibChannelsMappingTable1[i], 0);
@@ -340,7 +340,7 @@
adlibWrite(1, _adlibWaveformSelect);
}
-void AdlibMidiDriver::adlibSetPitchBend(int channel, int range) {
+void AdLibMidiDriver::adlibSetPitchBend(int channel, int range) {
if ((_adlibRhythmEnabled && channel <= 6) || channel < 9) {
if (range > 16383) {
range = 16383;
@@ -350,11 +350,11 @@
}
}
-void AdlibMidiDriver::adlibPlayNote(int channel) {
+void AdLibMidiDriver::adlibPlayNote(int channel) {
_midiChannelsFreqTable[channel] = adlibPlayNoteHelper(channel, _midiChannelsNote1Table[channel], _midiChannelsNote2Table[channel], _midiChannelsOctTable[channel]);
}
-uint8 AdlibMidiDriver::adlibPlayNoteHelper(int channel, int note1, int note2, int oct) {
+uint8 AdLibMidiDriver::adlibPlayNoteHelper(int channel, int note1, int note2, int oct) {
int n = ((note2 * _midiChannelsNoteTable[channel]) >> 8) - 8192;
if (n != 0) {
n >>= 5;
@@ -383,7 +383,7 @@
return value;
}
-void AdlibMidiDriver::adlibTurnNoteOff(int channel) {
+void AdLibMidiDriver::adlibTurnNoteOff(int channel) {
if ((_adlibRhythmEnabled && channel <= 6) || channel < 9) {
_midiChannelsOctTable[channel] = 0;
_midiChannelsFreqTable[channel] &= ~0x20;
@@ -394,7 +394,7 @@
}
}
-void AdlibMidiDriver::adlibTurnNoteOn(int channel, int note) {
+void AdLibMidiDriver::adlibTurnNoteOn(int channel, int note) {
note -= 12;
if (note < 0) {
note = 0;
@@ -418,14 +418,14 @@
}
}
-void AdlibMidiDriver::adlibSetupChannelFromSequence(int channel, const uint8 *src, int fl) {
+void AdLibMidiDriver::adlibSetupChannelFromSequence(int channel, const uint8 *src, int fl) {
for (int i = 0; i < 13; ++i) {
_adlibSetupChannelSequence2[i] = src[i];
}
adlibSetupChannel(channel, _adlibSetupChannelSequence2, fl);
}
-void AdlibMidiDriver::adlibSetupChannel(int channel, const uint16 *src, int fl) {
+void AdLibMidiDriver::adlibSetupChannel(int channel, const uint16 *src, int fl) {
for (int i = 0; i < 13; ++i) {
_adlibSetupChannelSequence1[14 * channel + i] = src[i];
}
@@ -433,7 +433,7 @@
adlibSetupChannelHelper(channel);
}
-void AdlibMidiDriver::adlibSetNoteVolume(int channel, int volume) {
+void AdLibMidiDriver::adlibSetNoteVolume(int channel, int volume) {
if (_midiNumberOfChannels > channel) {
if (volume > 127) {
volume = 127;
@@ -452,7 +452,7 @@
}
}
-void AdlibMidiDriver::adlibSetupChannelHelper(int channel) {
+void AdLibMidiDriver::adlibSetupChannelHelper(int channel) {
adlibSetAmpVibratoRhythm();
adlibSetCSMKeyboardSplit();
adlibSetChannel0x40(channel);
@@ -463,7 +463,7 @@
adlibSetChannel0xE0(channel);
}
-void AdlibMidiDriver::adlibSetChannel0x40(int channel) {
+void AdLibMidiDriver::adlibSetChannel0x40(int channel) {
int index, value, fl;
if (_adlibRhythmEnabled) {
@@ -488,7 +488,7 @@
adlibWrite(0x40 + _adlibChannelsMappingTable1[channel], value);
}
-void AdlibMidiDriver::adlibSetChannel0xC0(int channel) {
+void AdLibMidiDriver::adlibSetChannel0xC0(int channel) {
if (_adlibChannelsNoFeedback[channel] == 0) {
const uint8 *p = &_adlibSetupChannelSequence1[channel * 14];
uint8 value = p[2] << 1;
@@ -499,19 +499,19 @@
}
}
-void AdlibMidiDriver::adlibSetChannel0x60(int channel) {
+void AdLibMidiDriver::adlibSetChannel0x60(int channel) {
const uint8 *p = &_adlibSetupChannelSequence1[channel * 14];
uint8 value = (p[3] << 4) | (p[6] & 15);
adlibWrite(0x60 + _adlibChannelsMappingTable1[channel], value);
}
-void AdlibMidiDriver::adlibSetChannel0x80(int channel) {
+void AdLibMidiDriver::adlibSetChannel0x80(int channel) {
const uint8 *p = &_adlibSetupChannelSequence1[channel * 14];
uint8 value = (p[4] << 4) | (p[7] & 15);
adlibWrite(0x80 + _adlibChannelsMappingTable1[channel], value);
}
-void AdlibMidiDriver::adlibSetChannel0x20(int channel) {
+void AdLibMidiDriver::adlibSetChannel0x20(int channel) {
const uint8 *p = &_adlibSetupChannelSequence1[channel * 14];
uint8 value = p[1] & 15;
if (p[9]) {
@@ -529,7 +529,7 @@
adlibWrite(0x20 + _adlibChannelsMappingTable1[channel], value);
}
-void AdlibMidiDriver::adlibSetChannel0xE0(int channel) {
+void AdLibMidiDriver::adlibSetChannel0xE0(int channel) {
uint8 value = 0;
if (_adlibWaveformSelect) {
const uint8 *p = &_adlibSetupChannelSequence1[channel * 14];
@@ -538,71 +538,71 @@
adlibWrite(0xE0 + _adlibChannelsMappingTable1[channel], value);
}
-const uint8 AdlibMidiDriver::_adlibChannelsMappingTable1[] = {
+const uint8 AdLibMidiDriver::_adlibChannelsMappingTable1[] = {
0, 1, 2, 3, 4, 5, 8, 9, 10, 11, 12, 13, 16, 17, 18, 19, 20, 21
};
-const uint8 AdlibMidiDriver::_adlibChannelsNoFeedback[] = {
+const uint8 AdLibMidiDriver::_adlibChannelsNoFeedback[] = {
0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1
};
-const uint8 AdlibMidiDriver::_adlibChannelsMappingTable2[] = {
+const uint8 AdLibMidiDriver::_adlibChannelsMappingTable2[] = {
0, 1, 2, 0, 1, 2, 3, 4, 5, 3, 4, 5, 6, 7, 8, 6, 7, 8
};
-const uint8 AdlibMidiDriver::_adlibChannelsMappingTable3[] = {
+const uint8 AdLibMidiDriver::_adlibChannelsMappingTable3[] = {
0, 1, 2, 0, 1, 2, 3, 4, 5, 3, 4, 5, 6, 10, 8, 6, 7, 9
};
-const uint8 AdlibMidiDriver::_adlibChannelsKeyScalingTable1[] = {
+const uint8 AdLibMidiDriver::_adlibChannelsKeyScalingTable1[] = {
0, 3, 1, 4, 2, 5, 6, 9, 7, 10, 8, 11, 12, 15, 13, 16, 14, 17
};
-const uint8 AdlibMidiDriver::_adlibChannelsKeyScalingTable2[] = {
+const uint8 AdLibMidiDriver::_adlibChannelsKeyScalingTable2[] = {
0, 3, 1, 4, 2, 5, 6, 9, 7, 10, 8, 11, 12, 15, 16, 255, 14, 255, 17, 255, 13, 255
};
-const uint8 AdlibMidiDriver::_adlibChannelsVolumeTable[] = {
+const uint8 AdLibMidiDriver::_adlibChannelsVolumeTable[] = {
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128
};
-const uint8 AdlibMidiDriver::_adlibInitSequenceData1[] = {
+const uint8 AdLibMidiDriver::_adlibInitSequenceData1[] = {
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list