Preload 3DO sounds

Author: cyxx

mixer.cpp

@@ -7,6 +7,7 @@
 #include <SDL.h>
 #define MIX_INIT_FLUIDSYNTH MIX_INIT_MID // renamed with SDL2_mixer >= 2.0.2
 #include <SDL_mixer.h>
+#include <map>
 #include "aifcplayer.h"
 #include "mixer.h"
 #include "sfxplayer.h"
@@ -126,6 +127,7 @@ struct Mixer_impl {
 	Mix_Music *_music;
 	MixerChannel _channels[kMixChannels]; // 0,3:left 1,2:right
 	SfxPlayer *_sfx;
+	std::map<int, Mix_Chunk *> _preloads; // AIFF preloads (3DO)
 
 	void init(bool softwareMixer) {
 		memset(_sounds, 0, sizeof(_sounds));
@@ -168,12 +170,6 @@ struct Mixer_impl {
 		Mix_Chunk *chunk = loadAndConvertWav(rw, 1, freq, kMixFormat, kMixSoundChannels, kMixFreq);
 		playSound(channel, volume, chunk, loops);
 	}
-	void playSoundAiff(uint8_t channel, const uint8_t *data, uint8_t volume) {
-		const uint32_t size = READ_BE_UINT32(data + 4) + 8;
-		SDL_RWops *rw = SDL_RWFromConstMem(data, size);
-		Mix_Chunk *chunk = Mix_LoadWAV_RW(rw, 1);
-		playSound(channel, volume, chunk);
-	}
 	void playSound(uint8_t channel, int volume, Mix_Chunk *chunk, int loops = 0) {
 		stopSound(channel);
 		if (chunk) {
@@ -267,6 +263,32 @@ struct Mixer_impl {
 		}
 		stopMusic();
 		stopSfxMusic();
+		for (std::map<int, Mix_Chunk *>::iterator it = _preloads.begin(); it != _preloads.end(); ++it) {
+			debug(DBG_SND, "Flush preload %d", it->first);
+			Mix_FreeChunk(it->second);
+		}
+		_preloads.clear();
+	}
+
+	void preloadSoundAiff(int num, const uint8_t *data) {
+		if (_preloads.find(num) != _preloads.end()) {
+			warning("AIFF sound %d is already preloaded", num);
+		} else {
+			const uint32_t size = READ_BE_UINT32(data + 4) + 8;
+			SDL_RWops *rw = SDL_RWFromConstMem(data, size);
+			Mix_Chunk *chunk = Mix_LoadWAV_RW(rw, 1);
+			_preloads[num] = chunk;
+		}
+	}
+
+	void playSoundAiff(int channel, int num, int volume) {
+		if (_preloads.find(num) == _preloads.end()) {
+			warning("AIFF sound %d is not preloaded", num);
+		} else {
+			Mix_Chunk *chunk = _preloads[num];
+			Mix_PlayChannel(channel, chunk, 0);
+			Mix_Volume(channel, volume * MIX_MAX_VOLUME / 63);
+		}
 	}
 };
 
@@ -308,13 +330,6 @@ void Mixer::playSoundWav(uint8_t channel, const uint8_t *data, uint16_t freq, ui
 	}
 }
 
-void Mixer::playSoundAiff(uint8_t channel, const uint8_t *data, uint8_t volume) {
-	debug(DBG_SND, "Mixer::playSoundAiff(%d, %d)", channel, volume);
-	if (_impl) {
-		return _impl->playSoundAiff(channel, data, volume);
-	}
-}
-
 void Mixer::stopSound(uint8_t channel) {
 	debug(DBG_SND, "Mixer::stopChannel(%d)", channel);
 	if (_impl) {
@@ -384,3 +399,17 @@ void Mixer::stopAll() {
 		return _impl->stopAll();
 	}
 }
+
+void Mixer::preloadSoundAiff(uint8_t num, const uint8_t *data) {
+	debug(DBG_SND, "Mixer::preloadSoundAiff(num:%d, data:%p)", num, data);
+	if (_impl) {
+		return _impl->preloadSoundAiff(num, data);
+	}
+}
+
+void Mixer::playSoundAiff(uint8_t channel, uint8_t num, uint8_t volume) {
+	debug(DBG_SND, "Mixer::playSoundAiff()");
+	if (_impl) {
+		return _impl->playSoundAiff(channel, num, volume);
+	}
+}

mixer.h

@@ -25,7 +25,6 @@ struct Mixer {
 
 	void playSoundRaw(uint8_t channel, const uint8_t *data, uint16_t freq, uint8_t volume);
 	void playSoundWav(uint8_t channel, const uint8_t *data, uint16_t freq, uint8_t volume, uint8_t loop);
-	void playSoundAiff(uint8_t channel, const uint8_t *data, uint8_t volume);
 	void stopSound(uint8_t channel);
 	void setChannelVolume(uint8_t channel, uint8_t volume);
 	void playMusic(const char *path, uint8_t loop);
@@ -35,6 +34,8 @@ struct Mixer {
 	void playSfxMusic(int num);
 	void stopSfxMusic();
 	void stopAll();
+	void preloadSoundAiff(uint8_t num, const uint8_t *data);
+	void playSoundAiff(uint8_t channel, uint8_t num, uint8_t volume);
 };
 
 #endif

resource.cpp

@@ -408,7 +408,7 @@ static const int _memListBmp[] = {
 	145, 144, 73, 72, 70, 69, 68, 67, -1
 };
 
-void Resource::update(uint16_t num) {
+void Resource::update(uint16_t num, PreloadSoundProc preloadSound, void *data) {
 	if (num > 16000) {
 		_nextPart = num;
 		return;
@@ -439,7 +439,11 @@ void Resource::update(uint16_t num) {
 		if (num >= 2000) { // preload sounds
 			const uint8_t *soundsList = getSoundsList3DO(num);
 			for (int i = 0; soundsList[i] != 255; ++i) {
-				loadDat(soundsList[i]);
+				const int soundNum = soundsList[i];
+				loadDat(soundNum);
+				if (_memList[soundNum].status == STATUS_LOADED) {
+					preloadSound(data, soundNum, _memList[soundNum].bufPtr);
+				}
 			}
 		} else if (num >= 200) {
 			loadBmp(num);

resource.h

@@ -64,7 +64,10 @@ struct ResourceWin31;
 struct Resource3do;
 struct Video;
 
+typedef void (*PreloadSoundProc)(void *userdata, int num, const uint8_t *data);
+
 struct Resource {
+
 	enum ResType {
 		RT_SOUND  = 0,
 		RT_MUSIC  = 1,
@@ -137,7 +140,7 @@ struct Resource {
 	void load();
 	void invalidateAll();
 	void invalidateRes();	
-	void update(uint16_t num);
+	void update(uint16_t num, PreloadSoundProc, void *);
 	void loadBmp(int num);
 	uint8_t *loadDat(int num);
 	void loadFont();

script.cpp

@@ -354,6 +354,10 @@ void Script::op_playSound() {
 	snd_playSound(resNum, freq, vol, channel);
 }
 
+static void preloadSoundCb(void *userdata, int soundNum, const uint8_t *data) {
+	((Script *)userdata)->snd_preloadSound(soundNum, data);
+}
+
 void Script::op_updateResources() {
 	uint16_t num = _scriptPtr.fetchWord();
 	debug(DBG_SCRIPT, "Script::op_updateResources(%d)", num);
@@ -362,7 +366,7 @@ void Script::op_updateResources() {
 		_mix->stopAll();
 		_res->invalidateRes();
 	} else {
-		_res->update(num);
+		_res->update(num, preloadSoundCb, this);
 	}
 }
 
@@ -748,6 +752,7 @@ void Script::snd_playSound(uint16_t resNum, uint8_t freq, uint8_t vol, uint8_t c
 	if (freq > 39) {
 		freq = 39;
 	}
+	channel &= 3;
 	switch (_res->getDataType()) {
 	case Resource::DT_20TH_EDITION:
 		if (freq != 0) {
@@ -758,24 +763,20 @@ void Script::snd_playSound(uint16_t resNum, uint8_t freq, uint8_t vol, uint8_t c
 	case Resource::DT_WIN31: {
 			uint8_t *buf = _res->loadWav(resNum);
 			if (buf) {
-				_mix->playSoundWav(channel & 3, buf, getSoundFreq(freq), vol, getWavLooping(resNum));
+				_mix->playSoundWav(channel, buf, getSoundFreq(freq), vol, getWavLooping(resNum));
 			}
 		}
 		break;
-	case Resource::DT_3DO: {
-			MemEntry *me = &_res->_memList[resNum];
-			if (me->status == Resource::STATUS_LOADED) {
-				_mix->playSoundAiff(channel & 3, me->bufPtr, vol);
-			}
-		}
+	case Resource::DT_3DO:
+		_mix->playSoundAiff(channel, resNum, vol);
 		break;
 	case Resource::DT_AMIGA:
 	case Resource::DT_ATARI:
 	case Resource::DT_ATARI_DEMO:
 	case Resource::DT_DOS: {
 			MemEntry *me = &_res->_memList[resNum];
 			if (me->status == Resource::STATUS_LOADED) {
-				_mix->playSoundRaw(channel & 3, me->bufPtr, getSoundFreq(freq), vol);
+				_mix->playSoundRaw(channel, me->bufPtr, getSoundFreq(freq), vol);
 			}
 		}
 		break;
@@ -831,6 +832,12 @@ void Script::snd_playMusic(uint16_t resNum, uint16_t delay, uint8_t pos) {
 	}
 }
 
+void Script::snd_preloadSound(uint16_t resNum, const uint8_t *data) {
+	if (_res->getDataType() == Resource::DT_3DO) {
+		_mix->preloadSoundAiff(resNum, data);
+	}
+}
+
 void Script::fixUpPalette_changeScreen(int part, int screen) {
 	int pal = -1;
 	switch (part) {

script.h

@@ -109,6 +109,7 @@ struct Script {
 
 	void snd_playSound(uint16_t resNum, uint8_t freq, uint8_t vol, uint8_t channel);
 	void snd_playMusic(uint16_t resNum, uint16_t delay, uint8_t pos);
+	void snd_preloadSound(uint16_t resNum, const uint8_t *data);
 
 	void fixUpPalette_changeScreen(int part, int screen);
 };