OPENGL: Merged from trunk, from rev 52105 to 53396.

This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.

Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.

svn-id: r53399

1 files changed, 14 insertions, 40 deletions

diff --git a/engines/mohawk/sound.cpp b/engines/mohawk/sound.cpp
index 091bd68021..4a8c923c01 100644
--- a/engines/mohawk/sound.cpp
+++ b/engines/mohawk/sound.cpp
@@ -36,7 +36,6 @@
 namespace Mohawk {
 
 Sound::Sound(MohawkEngine* vm) : _vm(vm) {
-	_rivenSoundFile = NULL;
 	_midiDriver = NULL;
 	_midiParser = NULL;
 
@@ -51,7 +50,6 @@ Sound::Sound(MohawkEngine* vm) : _vm(vm) {
 Sound::~Sound() {
 	stopSound();
 	stopAllSLST();
-	delete _rivenSoundFile;
 
 	if (_midiDriver) {
 		_midiDriver->close();
@@ -64,15 +62,6 @@ Sound::~Sound() {
 	}
 }
 
-void Sound::loadRivenSounds(uint16 stack) {
-	static const char prefixes[] = { 'a', 'b', 'g', 'j', 'o', 'p', 'r', 't' };
-
-	if (!_rivenSoundFile)
-		_rivenSoundFile = new MohawkArchive();
-
-	_rivenSoundFile->open(Common::String(prefixes[stack]) + "_Sounds.mhk");
-}
-
 void Sound::initMidi() {
 	if (!(_vm->getFeatures() & GF_HASMIDI))
 		return;
@@ -87,7 +76,7 @@ void Sound::initMidi() {
 	_midiParser->setTimerRate(_midiDriver->getBaseTempo());
 }
 
-Audio::SoundHandle *Sound::playSound(uint16 id, bool mainSoundFile, byte volume, bool loop) {
+Audio::SoundHandle *Sound::playSound(uint16 id, byte volume, bool loop) {
 	debug (0, "Playing sound %d", id);
 
 	SndHandle *handle = getHandle();
@@ -113,21 +102,9 @@ Audio::SoundHandle *Sound::playSound(uint16 id, bool mainSoundFile, byte volume,
 		} else
 			audStream = makeMohawkWaveStream(_vm->getRawData(ID_MSND, id));
 		break;
-	case GType_RIVEN:
-		if (mainSoundFile)
-			audStream = makeMohawkWaveStream(_rivenSoundFile->getRawData(ID_TWAV, id));
-		else
-			audStream = makeMohawkWaveStream(_vm->getRawData(ID_TWAV, id));
-		break;
 	case GType_ZOOMBINI:
 		audStream = makeMohawkWaveStream(_vm->getRawData(ID_SND, id));
 		break;
-	case GType_CSAMTRAK:
-		if (mainSoundFile)
-			audStream = makeMohawkWaveStream(_vm->getRawData(ID_TWAV, id));
-		else
-			audStream = getCSAmtrakMusic(id);
-		break;
 	case GType_LIVINGBOOKSV1:
 		audStream = makeOldMohawkWaveStream(_vm->getRawData(ID_WAV, id));
 		break;
@@ -147,6 +124,13 @@ Audio::SoundHandle *Sound::playSound(uint16 id, bool mainSoundFile, byte volume,
 	return NULL;
 }
 
+void Sound::playSoundBlocking(uint16 id, byte volume) {
+	Audio::SoundHandle *handle = playSound(id, volume);
+
+	while (_vm->_mixer->isSoundHandleActive(*handle))
+		_vm->_system->delayMillis(10);
+}
+
 void Sound::playMidi(uint16 id) {
 	uint32 idTag;
 	if (!(_vm->getFeatures() & GF_HASMIDI)) {
@@ -188,6 +172,10 @@ void Sound::playMidi(uint16 id) {
 	_midiDriver->setTimerCallback(_midiParser, MidiParser::timerCallback);
 }
 
+byte Sound::convertRivenVolume(uint16 volume) {
+	return (volume == 256) ? 255 : volume;
+}
+
 void Sound::playSLST(uint16 index, uint16 card) {
 	Common::SeekableReadStream *slstStream = _vm->getRawData(ID_SLST, card);
 	SLSTRecord slstRecord;
@@ -304,19 +292,15 @@ void Sound::playSLSTSound(uint16 id, bool fade, bool loop, uint16 volume, int16
 	sndHandle.id = id;
 	_currentSLSTSounds.push_back(sndHandle);
 
-	Audio::AudioStream *audStream = makeMohawkWaveStream(_rivenSoundFile->getRawData(ID_TWAV, id));
+	Audio::AudioStream *audStream = makeMohawkWaveStream(_vm->getRawData(ID_TWAV, id));
 
 	// Loop here if necessary
 	if (loop)
 		audStream = Audio::makeLoopingAudioStream((Audio::RewindableAudioStream *)audStream, 0);
 
-	// The max mixer volume is 255 and the max Riven volume is 256. Just change it to 255.
-	if (volume == 256)
-		volume = 255;
-
 	// TODO: Handle fading, possibly just raise the volume of the channel in increments?
 
-	_vm->_mixer->playStream(Audio::Mixer::kPlainSoundType, sndHandle.handle, audStream, -1, volume, convertBalance(balance));
+	_vm->_mixer->playStream(Audio::Mixer::kPlainSoundType, sndHandle.handle, audStream, -1, convertRivenVolume(volume), convertBalance(balance));
 }
 
 void Sound::stopSLSTSound(uint16 index, bool fade) {
@@ -336,16 +320,6 @@ void Sound::resumeSLST() {
 		_vm->_mixer->pauseHandle(*_currentSLSTSounds[i].handle, false);
 }
 
-Audio::AudioStream *Sound::getCSAmtrakMusic(uint16 id) {
-	char filename[18];
-	sprintf(filename, "MUSIC/MUSIC%02d.MHK", id);
-	MohawkArchive *file = new MohawkArchive();
-	file->open(filename);
-	Audio::AudioStream *audStream = makeMohawkWaveStream(file->getRawData(ID_TWAV, 2000 + id));
-	delete file;
-	return audStream;
-}
-
 Audio::AudioStream *Sound::makeMohawkWaveStream(Common::SeekableReadStream *stream) {
 	uint32 tag = 0;
 	ADPC_Chunk adpc;