libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-10 21:03:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

added ambient effects (rest of vc_52)

Browse Source 
svn-id: r5502
This commit is contained in:
Oliver Kiehl 2002-11-10 16:25:03 +00:00
parent fb8f8c6105
commit 1a57316e16
2 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
simon/simon.cpp
View File

@ -147,6 +147,7 @@ SimonState::SimonState(GameDetector *detector, OSystem *syst)
_effects_sound = 0;
_voice_sound = 0;
_ambient_sound = 0;
}
SimonState::~SimonState()
@ -4840,7 +4841,7 @@ struct VocBlockHeader {
#ifdef USE_MAD
void SimonState::playMP3(File *sound_file, uint32 *offsets, uint sound, PlayingSoundHandle *sound_handle)
void SimonState::playMP3(File *sound_file, uint32 *offsets, uint sound, PlayingSoundHandle *sound_handle, byte flags)
{
sound_file->seek(offsets[sound], SEEK_SET);
@ -4849,11 +4850,11 @@ void SimonState::playMP3(File *sound_file, uint32 *offsets, uint sound, PlayingS
byte *buffer = (byte *)malloc(size);
sound_file->read(buffer, size);
_mixer->playMP3(sound_handle, buffer, size, SoundMixer::FLAG_AUTOFREE);
_mixer->playMP3(sound_handle, buffer, size, flags);
}
#endif
void SimonState::playVoc(File *sound_file, uint32 *offsets, uint sound, PlayingSoundHandle *sound_handle)
void SimonState::playVoc(File *sound_file, uint32 *offsets, uint sound, PlayingSoundHandle *sound_handle, byte flags)
{
VocHeader voc_hdr;
VocBlockHeader voc_block_hdr;
@ -4875,11 +4876,10 @@ void SimonState::playVoc(File *sound_file, uint32 *offsets, uint sound, PlayingS
byte *buffer = (byte *)malloc(size);
sound_file->read(buffer, size);
_mixer->playRaw(sound_handle, buffer, size, samples_per_sec,
SoundMixer::FLAG_UNSIGNED|SoundMixer::FLAG_AUTOFREE);
_mixer->playRaw(sound_handle, buffer, size, samples_per_sec, flags);
}
void SimonState::playWav(File *sound_file, uint32 *offsets, uint sound, PlayingSoundHandle *sound_handle)
void SimonState::playWav(File *sound_file, uint32 *offsets, uint sound, PlayingSoundHandle *sound_handle, byte flags)
{
WaveHeader wave_hdr;
uint32 data[2];
@ -4908,8 +4908,7 @@ void SimonState::playWav(File *sound_file, uint32 *offsets, uint sound, PlayingS
byte *buffer = (byte *)malloc(data[1]);
sound_file->read(buffer, data[1]);
_mixer->playRaw(sound_handle, buffer, data[1], READ_LE_UINT32(&wave_hdr.samples_per_sec),
SoundMixer::FLAG_UNSIGNED|SoundMixer::FLAG_AUTOFREE);
_mixer->playRaw(sound_handle, buffer, data[1], READ_LE_UINT32(&wave_hdr.samples_per_sec), flags);
}
void SimonState::playVoice(uint voice)
@ -4922,13 +4921,13 @@ void SimonState::playVoice(uint voice)
#ifdef USE_MAD
if (_voice_type == FORMAT_MP3) {
playMP3(_voice_file, _voice_offsets, voice, &_voice_sound);
playMP3(_voice_file, _voice_offsets, voice, &_voice_sound, SoundMixer::FLAG_AUTOFREE);
} else {
#endif
if (_voice_type == FORMAT_WAV) { /* WAVE audio */
playWav(_voice_file, _voice_offsets, voice, &_voice_sound);
playWav(_voice_file, _voice_offsets, voice, &_voice_sound, SoundMixer::FLAG_UNSIGNED|SoundMixer::FLAG_AUTOFREE);
} else if (_voice_type == FORMAT_VOC) { /* VOC audio */
playVoc(_voice_file, _voice_offsets, voice, &_voice_sound);
playVoc(_voice_file, _voice_offsets, voice, &_voice_sound, SoundMixer::FLAG_UNSIGNED|SoundMixer::FLAG_AUTOFREE);
}
#ifdef USE_MAD
}
@ -4943,24 +4942,38 @@ void SimonState::playSound(uint sound)
if (_game == GAME_SIMON1TALKIE) { /* simon 1 talkie */
#ifdef USE_MAD
if (_effects_type == FORMAT_MP3) {
playMP3(_effects_file, _effects_offsets, sound, &_effects_sound);
playMP3(_effects_file, _effects_offsets, sound, &_effects_sound, SoundMixer::FLAG_AUTOFREE);
} else {
#endif
playVoc(_effects_file, _effects_offsets, sound, &_effects_sound);
playVoc(_effects_file, _effects_offsets, sound, &_effects_sound, SoundMixer::FLAG_UNSIGNED|SoundMixer::FLAG_AUTOFREE);
#ifdef USE_MAD
}
#endif
} else if (_game == GAME_SIMON1WIN){ /* simon 1 win */
playWav(_effects_file, _effects_offsets, sound, &_effects_sound);
playWav(_effects_file, _effects_offsets, sound, &_effects_sound, SoundMixer::FLAG_UNSIGNED|SoundMixer::FLAG_AUTOFREE);
} else if (_game == GAME_SIMON2WIN) { /* simon 2 win */
playWav(_game_file, _effects_offsets, sound, &_effects_sound);
playWav(_game_file, _effects_offsets, sound, &_effects_sound, SoundMixer::FLAG_UNSIGNED|SoundMixer::FLAG_AUTOFREE);
} else if (_game & GAME_SIMON2) { /* simon 2 dos / talkie */
playVoc(_game_file, _effects_offsets, sound, &_effects_sound);
playVoc(_game_file, _effects_offsets, sound, &_effects_sound, SoundMixer::FLAG_UNSIGNED|SoundMixer::FLAG_AUTOFREE);
} else { /* simon 1 dos */
warning("playSound(%d)", sound);
}
}
void SimonState::playAmbient(uint sound)
{
if (_effects_sound != 0)
_mixer->stop(_ambient_sound);
if (_game & GAME_WIN) {
playWav(_game_file, _effects_offsets, sound, &_ambient_sound,
SoundMixer::FLAG_LOOP|SoundMixer::FLAG_UNSIGNED|SoundMixer::FLAG_AUTOFREE);
} else {
playVoc(_game_file, _effects_offsets, sound, &_ambient_sound,
SoundMixer::FLAG_LOOP|SoundMixer::FLAG_UNSIGNED|SoundMixer::FLAG_AUTOFREE);
}
}
void SimonState::playMusic(uint music)
{
/* FIXME: not properly implemented */

8
simon/simon.h
View File

@ -337,6 +337,7 @@ public:
PlayingSoundHandle _effects_sound;
PlayingSoundHandle _voice_sound;
PlayingSoundHandle _ambient_sound;
int _timer_id;
@ -775,10 +776,11 @@ public:
void initSound();
void playVoice(uint voice);
void playSound(uint sound);
void playAmbient(uint sound);
void playVoc(File *sound_file, uint32 *offsets, uint sound, PlayingSoundHandle *sound_handle);
void playWav(File *sound_file, uint32 *offsets, uint sound, PlayingSoundHandle *sound_handle);
void playMP3(File *sound_file, uint32 *offsets, uint sound, PlayingSoundHandle *sound_handle);
void playVoc(File *sound_file, uint32 *offsets, uint sound, PlayingSoundHandle *sound_handle, byte flags);
void playWav(File *sound_file, uint32 *offsets, uint sound, PlayingSoundHandle *sound_handle, byte flags);
void playMP3(File *sound_file, uint32 *offsets, uint sound, PlayingSoundHandle *sound_handle, byte flags);
void playMusic(uint music);
void checkTimerCallback();