aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/base/sound
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2012-07-26 04:12:58 +0200
committerEinar Johan Trøan Sømåen2012-07-26 04:12:58 +0200
commit38507fa9895620639d8733dbb4e085dfb2282a33 (patch)
tree2b246fa93ce4ec173ac3db77e8cbacc562c6bb20 /engines/wintermute/base/sound
parent1ad859a468415cc7fd93adaa84beba02aae29ad8 (diff)
downloadscummvm-rg350-38507fa9895620639d8733dbb4e085dfb2282a33.tar.gz
scummvm-rg350-38507fa9895620639d8733dbb4e085dfb2282a33.tar.bz2
scummvm-rg350-38507fa9895620639d8733dbb4e085dfb2282a33.zip
WINTERMUTE: AStyle-formatting.
Diffstat (limited to 'engines/wintermute/base/sound')
-rw-r--r--engines/wintermute/base/sound/base_sound.cpp2
-rw-r--r--engines/wintermute/base/sound/base_sound_buffer.cpp4
-rw-r--r--engines/wintermute/base/sound/base_sound_manager.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/wintermute/base/sound/base_sound.cpp b/engines/wintermute/base/sound/base_sound.cpp
index 1853d7abfd..8cc8c21948 100644
--- a/engines/wintermute/base/sound/base_sound.cpp
+++ b/engines/wintermute/base/sound/base_sound.cpp
@@ -229,7 +229,7 @@ bool BaseSound::setVolume(int volume) {
//////////////////////////////////////////////////////////////////////////
bool BaseSound::setPrivateVolume(int volume) {
- if (!_sound)
+ if (!_sound)
return STATUS_FAILED;
else return _sound->_privateVolume = volume;
}
diff --git a/engines/wintermute/base/sound/base_sound_buffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp
index 27276f4fa7..f2db0a18fb 100644
--- a/engines/wintermute/base/sound/base_sound_buffer.cpp
+++ b/engines/wintermute/base/sound/base_sound_buffer.cpp
@@ -110,7 +110,7 @@ bool BaseSoundBuffer::loadFromFile(const char *filename, bool forceReload) {
int waveSize, waveRate;
byte waveFlags;
uint16 waveType;
-
+
if (Audio::loadWAVFromStream(*_file, waveSize, waveRate, waveFlags, &waveType)) {
if (waveType == 1) {
// We need to wrap the file in a substream to make sure the size is right.
@@ -208,7 +208,7 @@ bool BaseSoundBuffer::play(bool looping, uint32 startSample) {
} else {
g_system->getMixer()->playStream(_type, _handle, _stream, -1, _volume, 0, DisposeAfterUse::NO);
}
- }
+ }
return STATUS_OK;
}
diff --git a/engines/wintermute/base/sound/base_sound_manager.cpp b/engines/wintermute/base/sound/base_sound_manager.cpp
index a73b20e404..cebc3a3765 100644
--- a/engines/wintermute/base/sound/base_sound_manager.cpp
+++ b/engines/wintermute/base/sound/base_sound_manager.cpp
@@ -80,7 +80,7 @@ void BaseSoundMgr::saveSettings() {
//////////////////////////////////////////////////////////////////////////
bool BaseSoundMgr::initialize() {
_soundAvailable = false;
-
+
if (!g_system->getMixer()->isReady()) {
return STATUS_FAILED;
}