diff options
-rw-r--r-- | engines/agi/agi_v2.cpp | 1 | ||||
-rw-r--r-- | engines/agi/agi_v3.cpp | 1 | ||||
-rw-r--r-- | engines/agi/sound.cpp | 25 | ||||
-rw-r--r-- | engines/agi/sound.h | 2 |
4 files changed, 0 insertions, 29 deletions
diff --git a/engines/agi/agi_v2.cpp b/engines/agi/agi_v2.cpp index 375bbec411..1cd9126350 100644 --- a/engines/agi/agi_v2.cpp +++ b/engines/agi/agi_v2.cpp @@ -256,7 +256,6 @@ int AgiLoader_v2::loadResource(int t, int n) { if (data != NULL) { _vm->_game.sounds[n].rdata = data; _vm->_game.dirSound[n].flags |= RES_LOADED; - _vm->_sound->decodeSound(n); } else { ec = errBadResource; } diff --git a/engines/agi/agi_v3.cpp b/engines/agi/agi_v3.cpp index 1e0baeaa81..c6fb850c60 100644 --- a/engines/agi/agi_v3.cpp +++ b/engines/agi/agi_v3.cpp @@ -347,7 +347,6 @@ int AgiLoader_v3::loadResource(int t, int n) { if (data != NULL) { _vm->_game.sounds[n].rdata = data; _vm->_game.dirSound[n].flags |= RES_LOADED; - _vm->_sound->decodeSound(n); } else { ec = errBadResource; } diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp index fb0f6f592f..36692cbe21 100644 --- a/engines/agi/sound.cpp +++ b/engines/agi/sound.cpp @@ -320,31 +320,6 @@ void SoundMgr::unloadSound(int resnum) { } } -void SoundMgr::decodeSound(int resnum) { -#if 0 - int type, size; - int16 *buf; - uint8 *src; - struct SoundIIgsSample *smp; - - debugC(3, kDebugLevelSound, "(%d)", resnum); - type = READ_LE_UINT16(_vm->_game.sounds[resnum].rdata); - - if (type == AGI_SOUND_SAMPLE) { - /* Convert sample data to 16 bit signed format - */ - smp = (struct SoundIIgsSample *)_vm->_game.sounds[resnum].rdata; - size = ((int)smp->sizeHi << 8) + smp->sizeLo; - src = (uint8 *)_vm->_game.sounds[resnum].rdata; - buf = (int16 *)calloc(1, 54 + (size << 1) + 100); /* FIXME */ - memcpy(buf, src, 54); - for (; size--; buf[size + 54] = ((int16)src[size + 54] - 0x80) << 4); /* FIXME */ - _vm->_game.sounds[resnum].rdata = (uint8 *) buf; - free(src); - } -#endif -} - void SoundMgr::startSound(int resnum, int flag) { int i, type; #if 0 diff --git a/engines/agi/sound.h b/engines/agi/sound.h index 5d2dda3258..2b5c045969 100644 --- a/engines/agi/sound.h +++ b/engines/agi/sound.h @@ -278,8 +278,6 @@ private: void premixerCall(int16 *buf, uint len); public: - - void decodeSound(int); void unloadSound(int); void playSound(); int initSound(); |