aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/sound
diff options
context:
space:
mode:
Diffstat (limited to 'engines/gob/sound')
-rw-r--r--engines/gob/sound/adlib.cpp2
-rw-r--r--engines/gob/sound/sound.cpp22
-rw-r--r--engines/gob/sound/sound.h2
3 files changed, 13 insertions, 13 deletions
diff --git a/engines/gob/sound/adlib.cpp b/engines/gob/sound/adlib.cpp
index 7566a9f8c7..e3dff14ace 100644
--- a/engines/gob/sound/adlib.cpp
+++ b/engines/gob/sound/adlib.cpp
@@ -59,7 +59,7 @@ void AdLib::init() {
_rate = _mixer->getOutputRate();
- _opl = makeAdlibOPL(_rate);
+ _opl = makeAdLibOPL(_rate);
_first = true;
_ended = false;
diff --git a/engines/gob/sound/sound.cpp b/engines/gob/sound/sound.cpp
index 2d7ba02385..a0add6f0b6 100644
--- a/engines/gob/sound/sound.cpp
+++ b/engines/gob/sound/sound.cpp
@@ -51,7 +51,7 @@ Sound::Sound(GobEngine *vm) : _vm(vm) {
_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 @@ bool Sound::sampleLoad(SoundDesc *sndDesc, SoundType type, const char *fileName,
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 @@ bool Sound::adlibLoadADL(const char *fileName) {
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 @@ bool Sound::adlibLoadADL(byte *data, uint32 size, int index) {
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 @@ void Sound::adlibUnload() {
if (!_hasAdLib)
return;
- debugC(1, kDebugSound, "Adlib: Unloading data");
+ debugC(1, kDebugSound, "AdLib: Unloading data");
if (_adlPlayer)
_adlPlayer->unload();
@@ -277,7 +277,7 @@ bool Sound::adlibLoadMDY(const char *fileName) {
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 @@ bool Sound::adlibLoadTBR(const char *fileName) {
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 @@ void Sound::adlibPlayTrack(const char *trackname) {
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 @@ void Sound::adlibPlay() {
if (!_hasAdLib)
return;
- debugC(1, kDebugSound, "Adlib: Starting playback");
+ debugC(1, kDebugSound, "AdLib: Starting playback");
if (_adlPlayer)
_adlPlayer->startPlay();
@@ -382,7 +382,7 @@ void Sound::adlibStop() {
if (!_hasAdLib)
return;
- debugC(1, kDebugSound, "Adlib: Stopping playback");
+ debugC(1, kDebugSound, "AdLib: Stopping playback");
if (_adlPlayer)
_adlPlayer->stopPlay();
diff --git a/engines/gob/sound/sound.h b/engines/gob/sound/sound.h
index 6f6c1d0469..516fed5c78 100644
--- a/engines/gob/sound/sound.h
+++ b/engines/gob/sound/sound.h
@@ -55,7 +55,7 @@ public:
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