From c224d35a432fff7e1d0a6bf5368f7f2e81a45e27 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 3 Sep 2016 10:34:38 -0400 Subject: TITANIC: Identified sound balance usage in the engine --- engines/titanic/sound/auto_sound_player.cpp | 8 ++++---- engines/titanic/sound/auto_sound_player.h | 2 +- engines/titanic/sound/auto_sound_player_adsr.cpp | 8 ++++---- engines/titanic/sound/gondolier_song.cpp | 4 ++-- engines/titanic/sound/proximity.cpp | 13 +++++++------ engines/titanic/sound/proximity.h | 9 ++------- engines/titanic/sound/sound_manager.cpp | 4 ++-- 7 files changed, 22 insertions(+), 26 deletions(-) (limited to 'engines/titanic/sound') diff --git a/engines/titanic/sound/auto_sound_player.cpp b/engines/titanic/sound/auto_sound_player.cpp index 8267d65037..4a3a1fe7f8 100644 --- a/engines/titanic/sound/auto_sound_player.cpp +++ b/engines/titanic/sound/auto_sound_player.cpp @@ -33,7 +33,7 @@ BEGIN_MESSAGE_MAP(CAutoSoundPlayer, CGameObject) END_MESSAGE_MAP() CAutoSoundPlayer::CAutoSoundPlayer() : CGameObject(), - _fieldBC(0), _volume(70), _fieldD0(0), _repeated(false), _soundHandle(-1), + _fieldBC(0), _volume(70), _balance(0), _repeated(false), _soundHandle(-1), _stopSeconds(0), _startSeconds(-1), _active(false), _fieldE8(0) { } @@ -42,7 +42,7 @@ void CAutoSoundPlayer::save(SimpleFile *file, int indent) { file->writeNumberLine(_fieldBC, indent); file->writeQuotedLine(_filename, indent); file->writeNumberLine(_volume, indent); - file->writeNumberLine(_fieldD0, indent); + file->writeNumberLine(_balance, indent); file->writeNumberLine(_repeated, indent); file->writeNumberLine(_soundHandle, indent); file->writeNumberLine(_stopSeconds, indent); @@ -58,7 +58,7 @@ void CAutoSoundPlayer::load(SimpleFile *file) { _fieldBC = file->readNumber(); _filename = file->readString(); _volume = file->readNumber(); - _fieldD0 = file->readNumber(); + _balance = file->readNumber(); _repeated = file->readNumber(); _soundHandle = file->readNumber(); _stopSeconds = file->readNumber(); @@ -72,7 +72,7 @@ void CAutoSoundPlayer::load(SimpleFile *file) { bool CAutoSoundPlayer::TurnOn(CTurnOn *msg) { if (_soundHandle == -1) { CProximity prox; - prox._fieldC = _fieldD0; + prox._balance = _balance; prox._repeated = _repeated; if (_fieldE8) prox._positioningMode = POSMODE_VECTOR; diff --git a/engines/titanic/sound/auto_sound_player.h b/engines/titanic/sound/auto_sound_player.h index c8f1d3480e..9f4d11ee06 100644 --- a/engines/titanic/sound/auto_sound_player.h +++ b/engines/titanic/sound/auto_sound_player.h @@ -38,7 +38,7 @@ public: int _fieldBC; CString _filename; int _volume; - int _fieldD0; + int _balance; bool _repeated; int _soundHandle; int _stopSeconds; diff --git a/engines/titanic/sound/auto_sound_player_adsr.cpp b/engines/titanic/sound/auto_sound_player_adsr.cpp index f9f045759b..d900ca0792 100644 --- a/engines/titanic/sound/auto_sound_player_adsr.cpp +++ b/engines/titanic/sound/auto_sound_player_adsr.cpp @@ -48,12 +48,12 @@ void CAutoSoundPlayerADSR::load(SimpleFile *file) { bool CAutoSoundPlayerADSR::TurnOn(CTurnOn *msg) { if (_soundHandle == -1) { if (!_soundName1.empty()) { - _soundHandle = playSound(_soundName1, _volume, _fieldD0); + _soundHandle = playSound(_soundName1, _volume, _balance); if (!_soundName2.empty()) - _soundHandle = queueSound(_soundName2, _soundHandle, _volume, _fieldD0); + _soundHandle = queueSound(_soundName2, _soundHandle, _volume, _balance); - _soundHandle = queueSound(_filename, _soundHandle, _volume, _fieldD0); + _soundHandle = queueSound(_filename, _soundHandle, _volume, _balance); _active = true; } } @@ -64,7 +64,7 @@ bool CAutoSoundPlayerADSR::TurnOn(CTurnOn *msg) { bool CAutoSoundPlayerADSR::TurnOff(CTurnOff *msg) { if (_soundHandle != -1) { if (!_soundName3.empty()) - queueSound(_soundName3, _soundHandle, _volume, _fieldD0); + queueSound(_soundName3, _soundHandle, _volume, _balance); if (isSoundActive(_soundHandle)) stopSound(_soundHandle); diff --git a/engines/titanic/sound/gondolier_song.cpp b/engines/titanic/sound/gondolier_song.cpp index a33ba12cd5..541ef7142f 100644 --- a/engines/titanic/sound/gondolier_song.cpp +++ b/engines/titanic/sound/gondolier_song.cpp @@ -49,9 +49,9 @@ bool CGondolierSong::TurnOn(CTurnOn *msg) { int volume = _value * _volume / 100; if (_startSeconds == -1) { - _soundHandle = playSound(_filename, volume, _fieldD0, _repeated); + _soundHandle = playSound(_filename, volume, _balance, _repeated); } else { - _soundHandle = playSound(_filename, 0, _fieldD0, _repeated); + _soundHandle = playSound(_filename, 0, _balance, _repeated); setSoundVolume(_soundHandle, _volume, _startSeconds); } diff --git a/engines/titanic/sound/proximity.cpp b/engines/titanic/sound/proximity.cpp index 59639fd9b5..517f22208b 100644 --- a/engines/titanic/sound/proximity.cpp +++ b/engines/titanic/sound/proximity.cpp @@ -25,13 +25,14 @@ namespace Titanic { -CProximity::CProximity() : _field4(0), _channelVolume(100), _fieldC(0), - _priorSoundHandle(-1), _field14(0), _frequencyMultiplier(0.0), _field1C(1.875), - _repeated(false), _channelMode(10), _positioningMode(POSMODE_NONE), _azimuth(0.0), - _range(0.5), _elevation(0), _posX(0.0), _posY(0.0), _posZ(0.0), +CProximity::CProximity() : _channelVolume(100), _balance(0), + _priorSoundHandle(-1), _frequencyMultiplier(0.0), _frequencyAdjust(1.875), + _repeated(false), _channelMode(10), _positioningMode(POSMODE_NONE), + _azimuth(0.0), _range(0.5), _elevation(0), + _posX(0.0), _posY(0.0), _posZ(0.0), _hasVelocity(false), _velocityX(0), _velocityY(0), _velocityZ(0), - _field54(0), _field58(0), _field5C(0), _freeSoundFlag(false), _endTalkerFn(nullptr), - _talker(nullptr), _soundDuration(0), _soundType(Audio::Mixer::kPlainSoundType) { + _freeSoundFlag(false), _endTalkerFn(nullptr), _talker(nullptr), + _soundDuration(0), _soundType(Audio::Mixer::kPlainSoundType) { } } // End of namespace Titanic diff --git a/engines/titanic/sound/proximity.h b/engines/titanic/sound/proximity.h index adad97d099..06fd2b1d3e 100644 --- a/engines/titanic/sound/proximity.h +++ b/engines/titanic/sound/proximity.h @@ -36,13 +36,11 @@ typedef void (*CEndTalkerFn)(TTtalker *talker); class CProximity { public: - int _field4; int _channelVolume; - int _fieldC; + int _balance; int _priorSoundHandle; - int _field14; double _frequencyMultiplier; - double _field1C; + double _frequencyAdjust; bool _repeated; int _channelMode; PositioningMode _positioningMode; @@ -56,9 +54,6 @@ public: double _velocityX; double _velocityY; double _velocityZ; - int _field54; - int _field58; - int _field5C; bool _freeSoundFlag; CEndTalkerFn _endTalkerFn; TTtalker *_talker; diff --git a/engines/titanic/sound/sound_manager.cpp b/engines/titanic/sound/sound_manager.cpp index 81ec5bc475..fb55e7dad9 100644 --- a/engines/titanic/sound/sound_manager.cpp +++ b/engines/titanic/sound/sound_manager.cpp @@ -371,7 +371,7 @@ int QSoundManager::playWave(CWaveFile *waveFile, int iChannel, uint flags, CProx return 0; prox._channelVolume = CLIP(prox._channelVolume, 0, 100); - prox._fieldC = CLIP(prox._fieldC, -100, 100); + prox._balance = CLIP(prox._balance, -100, 100); int slotIndex = findFreeSlot(); if (slotIndex == -1) @@ -399,7 +399,7 @@ int QSoundManager::playWave(CWaveFile *waveFile, int iChannel, uint flags, CProx break; } - if (prox._frequencyMultiplier || prox._field1C != 1.875) { + if (prox._frequencyMultiplier || prox._frequencyAdjust != 1.875) { uint freq = (uint)(waveFile->getFrequency() * prox._frequencyMultiplier); qsWaveMixSetFrequency(iChannel, 8, freq); } -- cgit v1.2.3