aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/sound
diff options
context:
space:
mode:
Diffstat (limited to 'engines/titanic/sound')
-rw-r--r--engines/titanic/sound/auto_music_player_base.cpp2
-rw-r--r--engines/titanic/sound/enter_view_toggles_other_music.cpp2
-rw-r--r--engines/titanic/sound/proximity.cpp4
-rw-r--r--engines/titanic/sound/qmixer.cpp6
-rw-r--r--engines/titanic/sound/qmixer.h6
-rw-r--r--engines/titanic/sound/room_trigger_auto_music_player.h2
-rw-r--r--engines/titanic/sound/season_noises.cpp2
-rw-r--r--engines/titanic/sound/sound.cpp2
-rw-r--r--engines/titanic/sound/sound_manager.cpp4
-rw-r--r--engines/titanic/sound/sound_manager.h4
-rw-r--r--engines/titanic/sound/view_toggles_other_music.cpp2
11 files changed, 18 insertions, 18 deletions
diff --git a/engines/titanic/sound/auto_music_player_base.cpp b/engines/titanic/sound/auto_music_player_base.cpp
index ad8b848c03..49ae906e91 100644
--- a/engines/titanic/sound/auto_music_player_base.cpp
+++ b/engines/titanic/sound/auto_music_player_base.cpp
@@ -71,7 +71,7 @@ bool CAutoMusicPlayerBase::TimerMsg(CTimerMsg *msg) {
bool CAutoMusicPlayerBase::LoadSuccessMsg(CLoadSuccessMsg *msg) {
if (_isRepeated)
playGlobalSound(_filename, _volumeMode, _initialMute, true, 0);
-
+
return true;
}
diff --git a/engines/titanic/sound/enter_view_toggles_other_music.cpp b/engines/titanic/sound/enter_view_toggles_other_music.cpp
index 2f0091a0a3..2d23043d83 100644
--- a/engines/titanic/sound/enter_view_toggles_other_music.cpp
+++ b/engines/titanic/sound/enter_view_toggles_other_music.cpp
@@ -28,7 +28,7 @@ BEGIN_MESSAGE_MAP(CEnterViewTogglesOtherMusic, CTriggerAutoMusicPlayer)
ON_MESSAGE(EnterViewMsg)
END_MESSAGE_MAP()
-CEnterViewTogglesOtherMusic::CEnterViewTogglesOtherMusic() :
+CEnterViewTogglesOtherMusic::CEnterViewTogglesOtherMusic() :
CTriggerAutoMusicPlayer(), _value(2) {
}
diff --git a/engines/titanic/sound/proximity.cpp b/engines/titanic/sound/proximity.cpp
index ee1cd3e741..796e344ae2 100644
--- a/engines/titanic/sound/proximity.cpp
+++ b/engines/titanic/sound/proximity.cpp
@@ -27,8 +27,8 @@ namespace Titanic {
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),
+ _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),
_disposeAfterUse(DisposeAfterUse::NO), _endTalkerFn(nullptr), _talker(nullptr),
diff --git a/engines/titanic/sound/qmixer.cpp b/engines/titanic/sound/qmixer.cpp
index c095b84e17..733164947e 100644
--- a/engines/titanic/sound/qmixer.cpp
+++ b/engines/titanic/sound/qmixer.cpp
@@ -31,7 +31,7 @@ QMixer::QMixer(Audio::Mixer *mixer) : _mixer(mixer) {
bool QMixer::qsWaveMixInitEx(const QMIXCONFIG &config) {
assert(_channels.empty());
assert(config.iChannels > 0 && config.iChannels < 256);
-
+
_channels.resize(config.iChannels);
return true;
}
@@ -71,7 +71,7 @@ void QMixer::qsWaveMixSetPanRate(int iChannel, uint flags, uint rate) {
void QMixer::qsWaveMixSetVolume(int iChannel, uint flags, uint volume) {
ChannelEntry &channel = _channels[iChannel];
-
+
// QMixer volumes go from 0-32767, but we need to convert to 0-255 for ScummVM
assert(volume <= 32767);
byte newVolume = (volume >= 32700) ? 255 : volume * 255 / 32767;
@@ -149,7 +149,7 @@ void QMixer::qsWaveMixPump() {
if (channel._volumeChangeEnd) {
byte oldVolume = channel._volume;
uint currentTicks = g_system->getMillis();
-
+
if (currentTicks >= channel._volumeChangeEnd) {
// Reached end of transition period
channel._volume = channel._volumeEnd;
diff --git a/engines/titanic/sound/qmixer.h b/engines/titanic/sound/qmixer.h
index 6a25484c29..9a0ea85ede 100644
--- a/engines/titanic/sound/qmixer.h
+++ b/engines/titanic/sound/qmixer.h
@@ -156,7 +156,7 @@ struct QMIXPLAYPARAMS {
Audio::Mixer::SoundType _soundType;
QMIXPLAYPARAMS() : dwSize(36), lpImage(nullptr), hwndNotify(0), callback(nullptr),
- dwUser(nullptr), lStart(0), lStartLoop(0), lEndLoop(0), lEnd(0),
+ dwUser(nullptr), lStart(0), lStartLoop(0), lEndLoop(0), lEnd(0),
lpChannelParams(nullptr), _soundType(Audio::Mixer::kPlainSoundType) {}
};
@@ -165,7 +165,7 @@ struct QMIXPLAYPARAMS {
* QSound Labs, Inc. Which itself is apparently based on Microsoft's
* WaveMix API.
*
- * It does not currently have any actual code from the library,
+ * It does not currently have any actual code from the library,
* and instead remaps calls to ScummVM's existing mixer where possible.
* This means that advanced features of the QMixer library, like being
* able to set up both the player and sounds at different positions are
@@ -189,7 +189,7 @@ class QMixer {
// Currently playing and any following queued sounds for the channel
Common::List<SoundEntry> _sounds;
// Current channel volume
- byte _volume;
+ byte _volume;
// Current time in milliseconds for paning (volume) changes
uint _panRate;
// Fields used to transition between volume levels
diff --git a/engines/titanic/sound/room_trigger_auto_music_player.h b/engines/titanic/sound/room_trigger_auto_music_player.h
index a57e133eb6..1c3394ce15 100644
--- a/engines/titanic/sound/room_trigger_auto_music_player.h
+++ b/engines/titanic/sound/room_trigger_auto_music_player.h
@@ -31,7 +31,7 @@ namespace Titanic {
class CRoomTriggerAutoMusicPlayer : public CTriggerAutoMusicPlayer {
DECLARE_MESSAGE_MAP;
bool LeaveRoomMsg(CLeaveRoomMsg *msg);
- bool EnterRoomMsg(CEnterRoomMsg *msg);
+ bool EnterRoomMsg(CEnterRoomMsg *msg);
public:
CLASSDEF;
diff --git a/engines/titanic/sound/season_noises.cpp b/engines/titanic/sound/season_noises.cpp
index ce045488ee..14689d5337 100644
--- a/engines/titanic/sound/season_noises.cpp
+++ b/engines/titanic/sound/season_noises.cpp
@@ -89,7 +89,7 @@ bool CSeasonNoises::ActMsg(CActMsg *msg) {
default:
break;
}
-
+
CSignalObject signalMsg;
signalMsg._numValue = 2;
signalMsg.execute(this);
diff --git a/engines/titanic/sound/sound.cpp b/engines/titanic/sound/sound.cpp
index 3288c4f4dd..a8c4849f2b 100644
--- a/engines/titanic/sound/sound.cpp
+++ b/engines/titanic/sound/sound.cpp
@@ -26,7 +26,7 @@
namespace Titanic {
-CSound::CSound(CGameManager *owner, Audio::Mixer *mixer) :
+CSound::CSound(CGameManager *owner, Audio::Mixer *mixer) :
_gameManager(owner), _soundManager(mixer) {
g_vm->_movieManager.setSoundManager(&_soundManager);
}
diff --git a/engines/titanic/sound/sound_manager.cpp b/engines/titanic/sound/sound_manager.cpp
index 1fb0c7341c..c1a46e5103 100644
--- a/engines/titanic/sound/sound_manager.cpp
+++ b/engines/titanic/sound/sound_manager.cpp
@@ -304,7 +304,7 @@ void QSoundManager::setPolarPosition(int handle, double range, double azimuth, d
Slot &slot = _slots[idx];
if (slot._handle == handle) {
qsWaveMixSetPanRate(slot._channel, QMIX_USEONCE, panRate);
- qsWaveMixSetPolarPosition(slot._channel, QMIX_USEONCE,
+ qsWaveMixSetPolarPosition(slot._channel, QMIX_USEONCE,
QSPOLAR(azimuth, range, elevation));
break;
}
@@ -452,7 +452,7 @@ void QSoundManager::updateVolume(int channel, uint panRate) {
default:
break;
}
-
+
volume = (_musicPercent * volume) / 100;
qsWaveMixSetPanRate(channel, 0, panRate);
qsWaveMixSetVolume(channel, 0, (uint)volume);
diff --git a/engines/titanic/sound/sound_manager.h b/engines/titanic/sound/sound_manager.h
index d1afdb4ad4..a3074a8e57 100644
--- a/engines/titanic/sound/sound_manager.h
+++ b/engines/titanic/sound/sound_manager.h
@@ -45,7 +45,7 @@ protected:
public:
CSoundManager();
virtual ~CSoundManager() {}
-
+
/**
* Loads a sound
* @param name Name of sound resource
@@ -189,7 +189,7 @@ public:
* Called after saving is complete
*/
virtual void postSave() {}
-
+
/**
* Sets the position and orientation for the listener (player)
*/
diff --git a/engines/titanic/sound/view_toggles_other_music.cpp b/engines/titanic/sound/view_toggles_other_music.cpp
index 731f59bd53..ffca1caea7 100644
--- a/engines/titanic/sound/view_toggles_other_music.cpp
+++ b/engines/titanic/sound/view_toggles_other_music.cpp
@@ -28,7 +28,7 @@ BEGIN_MESSAGE_MAP(CViewTogglesOtherMusic, CEnterViewTogglesOtherMusic)
ON_MESSAGE(LeaveViewMsg)
END_MESSAGE_MAP()
-CViewTogglesOtherMusic::CViewTogglesOtherMusic() :
+CViewTogglesOtherMusic::CViewTogglesOtherMusic() :
CEnterViewTogglesOtherMusic(), _value(1) {
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 15:36:47 +0000