1 files changed, 0 insertions, 141 deletions

diff --git a/engines/mohawk/sound.cpp b/engines/mohawk/sound.cpp
index dd9325250d..0711561068 100644
--- a/engines/mohawk/sound.cpp
+++ b/engines/mohawk/sound.cpp
@@ -191,7 +191,6 @@ Sound::Sound(MohawkEngine* vm) : _vm(vm) {
 
 Sound::~Sound() {
 	stopSound();
-	stopAllSLST();
 	stopBackgroundMyst();
 
 	if (_midiParser) {
@@ -378,146 +377,6 @@ void Sound::stopMidi() {
 	_midiParser->unloadMusic();
 }
 
-byte Sound::convertRivenVolume(uint16 volume) {
-	return (volume == 256) ? 255 : volume;
-}
-
-void Sound::playSLST(uint16 index, uint16 card) {
-	Common::SeekableReadStream *slstStream = _vm->getResource(ID_SLST, card);
-	SLSTRecord slstRecord;
-	uint16 recordCount = slstStream->readUint16BE();
-
-	for (uint16 i = 0; i < recordCount; i++) {
-		slstRecord.index = slstStream->readUint16BE();
-		slstRecord.sound_count = slstStream->readUint16BE();
-		slstRecord.sound_ids = new uint16[slstRecord.sound_count];
-
-		for (uint16 j = 0; j < slstRecord.sound_count; j++)
-			slstRecord.sound_ids[j] = slstStream->readUint16BE();
-
-		slstRecord.fade_flags = slstStream->readUint16BE();
-		slstRecord.loop = slstStream->readUint16BE();
-		slstRecord.global_volume = slstStream->readUint16BE();
-		slstRecord.u0 = slstStream->readUint16BE();			// Unknown
-
-		if (slstRecord.u0 > 1)
-			warning("slstRecord.u0: %d non-boolean", slstRecord.u0);
-
-		slstRecord.u1 = slstStream->readUint16BE();			// Unknown
-
-		if (slstRecord.u1 != 0)
-			warning("slstRecord.u1: %d non-zero", slstRecord.u1);
-
-		slstRecord.volumes = new uint16[slstRecord.sound_count];
-		slstRecord.balances = new int16[slstRecord.sound_count];
-		slstRecord.u2 = new uint16[slstRecord.sound_count];
-
-		for (uint16 j = 0; j < slstRecord.sound_count; j++)
-			slstRecord.volumes[j] = slstStream->readUint16BE();
-
-		for (uint16 j = 0; j < slstRecord.sound_count; j++)
-			slstRecord.balances[j] = slstStream->readSint16BE();	// negative = left, 0 = center, positive = right
-
-		for (uint16 j = 0; j < slstRecord.sound_count; j++) {
-			slstRecord.u2[j] = slstStream->readUint16BE();		// Unknown
-
-			if (slstRecord.u2[j] != 255 && slstRecord.u2[j] != 256)
-				warning("slstRecord.u2[%d]: %d not 255 or 256", j, slstRecord.u2[j]);
-		}
-
-		if (slstRecord.index == index) {
-			playSLST(slstRecord);
-			delete[] slstRecord.sound_ids;
-			delete[] slstRecord.volumes;
-			delete[] slstRecord.balances;
-			delete[] slstRecord.u2;
-			delete slstStream;
-			return;
-		}
-
-		delete[] slstRecord.sound_ids;
-		delete[] slstRecord.volumes;
-		delete[] slstRecord.balances;
-		delete[] slstRecord.u2;
-	}
-
-	delete slstStream;
-
-	// If we have no matching entries, we do nothing and just let
-	// the previous ambient sounds continue.
-}
-
-void Sound::playSLST(SLSTRecord slstRecord) {
-	// End old sounds
-	for (uint16 i = 0; i < _currentSLSTSounds.size(); i++) {
-		bool noLongerPlay = true;
-		for (uint16 j = 0; j < slstRecord.sound_count; j++)
-			if (_currentSLSTSounds[i].id == slstRecord.sound_ids[j])
-				noLongerPlay = false;
-		if (noLongerPlay)
-			stopSLSTSound(i, (slstRecord.fade_flags & 1) != 0);
-	}
-
-	// Start new sounds
-	for (uint16 i = 0; i < slstRecord.sound_count; i++) {
-		bool alreadyPlaying = false;
-		for (uint16 j = 0; j < _currentSLSTSounds.size(); j++) {
-			if (_currentSLSTSounds[j].id == slstRecord.sound_ids[i])
-				alreadyPlaying = true;
-		}
-		if (!alreadyPlaying) {
-			playSLSTSound(slstRecord.sound_ids[i],
-						 (slstRecord.fade_flags & (1 << 1)) != 0,
-						 slstRecord.loop != 0,
-						 slstRecord.volumes[i],
-						 slstRecord.balances[i]);
-		}
-	}
-}
-
-void Sound::stopAllSLST(bool fade) {
-	for (uint16 i = 0; i < _currentSLSTSounds.size(); i++) {
-		// TODO: Fade out, if requested
-		_vm->_mixer->stopHandle(*_currentSLSTSounds[i].handle);
-		delete _currentSLSTSounds[i].handle;
-	}
-
-	_currentSLSTSounds.clear();
-}
-
-static int8 convertBalance(int16 balance) {
-	return (int8)(balance >> 8);
-}
-
-void Sound::playSLSTSound(uint16 id, bool fade, bool loop, uint16 volume, int16 balance) {
-	// WORKAROUND: Some Riven SLST entries have a volume of 0, so we just ignore them.
-	if (volume == 0)
-		return;
-
-	SLSTSndHandle sndHandle;
-	sndHandle.handle = new Audio::SoundHandle();
-	sndHandle.id = id;
-	_currentSLSTSounds.push_back(sndHandle);
-
-	Audio::RewindableAudioStream *rewindStream = makeMohawkWaveStream(_vm->getResource(ID_TWAV, id));
-
-	// Loop here if necessary
-	Audio::AudioStream *audStream = rewindStream;
-	if (loop)
-		audStream = Audio::makeLoopingAudioStream(rewindStream, 0);
-
-	// TODO: Handle fading, possibly just raise the volume of the channel in increments?
-
-	_vm->_mixer->playStream(Audio::Mixer::kPlainSoundType, sndHandle.handle, audStream, -1, convertRivenVolume(volume), convertBalance(balance));
-}
-
-void Sound::stopSLSTSound(uint16 index, bool fade) {
-	// TODO: Fade out, if requested
-	_vm->_mixer->stopHandle(*_currentSLSTSounds[index].handle);
-	delete _currentSLSTSounds[index].handle;
-	_currentSLSTSounds.remove_at(index);
-}
-
 Audio::RewindableAudioStream *Sound::makeLivingBooksWaveStream_v1(Common::SeekableReadStream *stream) {
 	uint16 header = stream->readUint16BE();
 	uint16 rate = 0;