libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-04 16:26:53 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

VCRUISE: Hook up volume controls.

Browse Source
This commit is contained in:
elasota 2023-03-29 22:26:57 -04:00
parent c3154d5299
commit 7f549ce5c5
4 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/vcruise/audio_player.cpp
View File

@ -23,8 +23,8 @@
namespace VCruise {
AudioPlayer::AudioPlayer(Audio::Mixer *mixer, const Common::SharedPtr<Audio::AudioStream> &baseStream)
: _exhausted(false), _isPlaying(false), _mixer(mixer), _baseStream(baseStream) {
AudioPlayer::AudioPlayer(Audio::Mixer *mixer, const Common::SharedPtr<Audio::AudioStream> &baseStream, Audio::Mixer::SoundType soundType)
: _exhausted(false), _isPlaying(false), _mixer(mixer), _baseStream(baseStream), _soundType(soundType) {
}
AudioPlayer::~AudioPlayer() {
@ -62,7 +62,7 @@ void AudioPlayer::play(byte volume, int8 balance) {
if (!_isPlaying) {
_isPlaying = true;
_exhausted = false;
_mixer->playStream(Audio::Mixer::kPlainSoundType, &_handle, this, -1, volume, balance, DisposeAfterUse::NO);
_mixer->playStream(_soundType, &_handle, this, -1, volume, balance, DisposeAfterUse::NO);
}
}

4
engines/vcruise/audio_player.h
View File

@ -34,7 +34,7 @@ class CachedAudio;
class AudioPlayer : public Audio::AudioStream {
public:
AudioPlayer(Audio::Mixer *mixer, const Common::SharedPtr<Audio::AudioStream> &baseStream);
AudioPlayer(Audio::Mixer *mixer, const Common::SharedPtr<Audio::AudioStream> &baseStream, Audio::Mixer::SoundType soundType);
~AudioPlayer();
int readBuffer(int16 *buffer, const int numSamples) override;
@ -58,6 +58,8 @@ private:
bool _exhausted;
Audio::Mixer *_mixer;
Common::SharedPtr<Audio::AudioStream> _baseStream;
Audio::Mixer::SoundType _soundType;
};
} // End of namespace VCruise

37
engines/vcruise/runtime.cpp
View File

@ -275,7 +275,7 @@ void SfxData::load(Common::SeekableReadStream &stream, Audio::Mixer *mixer) {
sample->memoryStream.reset(new Common::MemoryReadStream(&sample->soundData[0], static_cast<uint32>(size)));
sample->audioStream.reset(Audio::makeWAVStream(sample->memoryStream.get(), DisposeAfterUse::NO));
sample->audioPlayer.reset(new AudioPlayer(mixer, sample->audioStream));
sample->audioPlayer.reset(new AudioPlayer(mixer, sample->audioStream, Audio::Mixer::kSFXSoundType));
this->sounds[keyValue.key] = sample;
}
@ -379,7 +379,7 @@ SoundCache::~SoundCache() {
SoundInstance::SoundInstance()
: id(0), rampStartVolume(0), rampEndVolume(0), rampRatePerMSec(0), rampStartTime(0), rampTerminateOnCompletion(false),
volume(0), balance(0), effectiveBalance(0), effectiveVolume(0), is3D(false), isLooping(false), x(0), y(0), z(0), endTime(0) {
volume(0), balance(0), effectiveBalance(0), effectiveVolume(0), is3D(false), isLooping(false), isSpeech(false), x(0), y(0), z(0), endTime(0) {
}
SoundInstance::~SoundInstance() {
@ -1924,7 +1924,7 @@ void Runtime::changeMusicTrack(int track) {
if (Audio::SeekableAudioStream *audioStream = Audio::makeWAVStream(wavFile, DisposeAfterUse::YES)) {
Common::SharedPtr<Audio::AudioStream> loopingStream(Audio::makeLoopingAudioStream(audioStream, 0));
_musicPlayer.reset(new AudioPlayer(_mixer, loopingStream));
_musicPlayer.reset(new AudioPlayer(_mixer, loopingStream, Audio::Mixer::kMusicSoundType));
_musicPlayer->play(100, 0);
}
} else {
@ -2036,11 +2036,12 @@ void Runtime::setSound3DParameters(SoundInstance &snd, int32 x, int32 y, const S
snd.params3D = soundParams3D;
}
void Runtime::triggerSound(bool looping, SoundInstance &snd, uint volume, int32 balance, bool is3D) {
void Runtime::triggerSound(bool looping, SoundInstance &snd, uint volume, int32 balance, bool is3D, bool isSpeech) {
snd.volume = volume;
snd.balance = balance;
snd.is3D = is3D;
snd.isLooping = looping;
snd.isSpeech = isSpeech;
computeEffectiveVolumeAndBalance(snd);
@ -2060,6 +2061,8 @@ void Runtime::triggerSound(bool looping, SoundInstance &snd, uint volume, int32
if (looping && !cache->loopingStream)
cache->loopingStream.reset(new Audio::LoopingAudioStream(cache->stream.get(), 0, DisposeAfterUse::NO, true));
const Audio::Mixer::SoundType soundType = (isSpeech ? Audio::Mixer::kSpeechSoundType : Audio::Mixer::kSFXSoundType);
if (cache->player) {
// If there is already a player and this is non-looping, start over
if (!looping) {
@ -2071,7 +2074,7 @@ void Runtime::triggerSound(bool looping, SoundInstance &snd, uint volume, int32
cache->player->setVolumeAndBalance(snd.effectiveVolume, snd.effectiveBalance);
}
} else {
cache->player.reset(new AudioPlayer(_mixer, looping ? cache->loopingStream.staticCast<Audio::AudioStream>() : cache->stream.staticCast<Audio::AudioStream>()));
cache->player.reset(new AudioPlayer(_mixer, looping ? cache->loopingStream.staticCast<Audio::AudioStream>() : cache->stream.staticCast<Audio::AudioStream>(), soundType));
cache->player->play(snd.effectiveVolume, snd.effectiveBalance);
}
@ -3267,7 +3270,7 @@ void Runtime::scriptOpSoundS1(ScriptArg_t arg) {
resolveSoundByName(sndNameArgs[0], soundID, cachedSound);
if (cachedSound)
triggerSound(false, *cachedSound, 100, 0, false);
triggerSound(false, *cachedSound, 100, 0, false, false);
}
void Runtime::scriptOpSoundS2(ScriptArg_t arg) {
@ -3279,7 +3282,7 @@ void Runtime::scriptOpSoundS2(ScriptArg_t arg) {
resolveSoundByName(sndNameArgs[0], soundID, cachedSound);
if (cachedSound)
triggerSound(false, *cachedSound, sndParamArgs[0], 0, false);
triggerSound(false, *cachedSound, sndParamArgs[0], 0, false, false);
}
void Runtime::scriptOpSoundS3(ScriptArg_t arg) {
@ -3291,7 +3294,7 @@ void Runtime::scriptOpSoundS3(ScriptArg_t arg) {
resolveSoundByName(sndNameArgs[0], soundID, cachedSound);
if (cachedSound)
triggerSound(false, *cachedSound, sndParamArgs[0], sndParamArgs[1], false);
triggerSound(false, *cachedSound, sndParamArgs[0], sndParamArgs[1], false, false);
}
void Runtime::scriptOpSoundL1(ScriptArg_t arg) {
@ -3302,7 +3305,7 @@ void Runtime::scriptOpSoundL1(ScriptArg_t arg) {
resolveSoundByName(sndNameArgs[0], soundID, cachedSound);
if (cachedSound)
triggerSound(true, *cachedSound, 100, 0, false);
triggerSound(true, *cachedSound, 100, 0, false, false);
}
void Runtime::scriptOpSoundL2(ScriptArg_t arg) {
@ -3314,7 +3317,7 @@ void Runtime::scriptOpSoundL2(ScriptArg_t arg) {
resolveSoundByName(sndNameArgs[0], soundID, cachedSound);
if (cachedSound)
triggerSound(true, *cachedSound, sndParamArgs[0], 0, false);
triggerSound(true, *cachedSound, sndParamArgs[0], 0, false, false);
}
void Runtime::scriptOpSoundL3(ScriptArg_t arg) {
@ -3326,7 +3329,7 @@ void Runtime::scriptOpSoundL3(ScriptArg_t arg) {
resolveSoundByName(sndNameArgs[0], soundID, cachedSound);
if (cachedSound)
triggerSound(true, *cachedSound, sndParamArgs[0], sndParamArgs[1], false);
triggerSound(true, *cachedSound, sndParamArgs[0], sndParamArgs[1], false, false);
}
void Runtime::scriptOp3DSoundL2(ScriptArg_t arg) {
@ -3339,7 +3342,7 @@ void Runtime::scriptOp3DSoundL2(ScriptArg_t arg) {
if (cachedSound) {
setSound3DParameters(*cachedSound, sndParamArgs[1], sndParamArgs[2], _pendingSoundParams3D);
triggerSound(true, *cachedSound, sndParamArgs[0], 0, true);
triggerSound(true, *cachedSound, sndParamArgs[0], 0, true, false);
}
}
@ -3353,7 +3356,7 @@ void Runtime::scriptOp3DSoundL3(ScriptArg_t arg) {
if (cachedSound) {
setSound3DParameters(*cachedSound, sndParamArgs[2], sndParamArgs[3], _pendingSoundParams3D);
triggerSound(true, *cachedSound, sndParamArgs[0], sndParamArgs[1], true);
triggerSound(true, *cachedSound, sndParamArgs[0], sndParamArgs[1], true, false);
}
}
@ -3367,7 +3370,7 @@ void Runtime::scriptOp3DSoundS2(ScriptArg_t arg) {
if (cachedSound) {
setSound3DParameters(*cachedSound, sndParamArgs[1], sndParamArgs[2], _pendingSoundParams3D);
triggerSound(false, *cachedSound, sndParamArgs[0], 0, true);
triggerSound(false, *cachedSound, sndParamArgs[0], 0, true, false);
}
}
@ -3615,7 +3618,7 @@ void Runtime::scriptOpSay1(ScriptArg_t arg) {
// uint cycleLength = sndParamArgs[1];
if (cachedSound)
triggerSound(false, *cachedSound, 100, 0, false);
triggerSound(false, *cachedSound, 100, 0, false, true);
}
void Runtime::scriptOpSay3(ScriptArg_t arg) {
@ -3636,7 +3639,7 @@ void Runtime::scriptOpSay3(ScriptArg_t arg) {
error("Invalid interrupt arg for say3, only 1 is supported.");
if (Common::find(_triggeredOneShots.begin(), _triggeredOneShots.end(), oneShot) == _triggeredOneShots.end()) {
triggerSound(false, *cachedSound, 100, 0, false);
triggerSound(false, *cachedSound, 100, 0, false, true);
_triggeredOneShots.push_back(oneShot);
}
}
@ -3660,7 +3663,7 @@ void Runtime::scriptOpSay3Get(ScriptArg_t arg) {
error("Invalid interrupt arg for say3, only 1 is supported.");
if (Common::find(_triggeredOneShots.begin(), _triggeredOneShots.end(), oneShot) == _triggeredOneShots.end()) {
triggerSound(false, *cachedSound, 100, 0, false);
triggerSound(false, *cachedSound, 100, 0, false, true);
_triggeredOneShots.push_back(oneShot);
_scriptStack.push_back(StackValue(soundID));
} else

3
engines/vcruise/runtime.h
View File

@ -217,6 +217,7 @@ struct SoundInstance {
bool is3D;
bool isLooping;
bool isSpeech;
int32 x;
int32 y;
int32 z;
@ -539,7 +540,7 @@ private:
void changeAnimation(const AnimationDef &animDef, uint initialFrame, bool consumeFPSOverride, const Fraction &defaultFrameRate);
void setSound3DParameters(SoundInstance &sound, int32 x, int32 y, const SoundParams3D &soundParams3D);
void triggerSound(bool looping, SoundInstance &sound, uint volume, int32 balance, bool is3D);
void triggerSound(bool looping, SoundInstance &sound, uint volume, int32 balance, bool is3D, bool isSpeech);
void triggerSoundRamp(SoundInstance &sound, uint durationMSec, uint newVolume, bool terminateOnCompletion);
void stopSound(SoundInstance &sound);
void updateSounds(uint32 timestamp);