aboutsummaryrefslogtreecommitdiff
path: root/queen/sound.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2005-04-07 08:57:40 +0000
committerTorbjörn Andersson2005-04-07 08:57:40 +0000
commit49bab70dedca35a924dfbbb7bbd16a664894dc71 (patch)
tree3beb41b7796a3daf71040f103672d0961c4040d3 /queen/sound.cpp
parente6395f1eefbb0ef14f6feca67ed0c5498bd13bbd (diff)
downloadscummvm-rg350-49bab70dedca35a924dfbbb7bbd16a664894dc71.tar.gz
scummvm-rg350-49bab70dedca35a924dfbbb7bbd16a664894dc71.tar.bz2
scummvm-rg350-49bab70dedca35a924dfbbb7bbd16a664894dc71.zip
Applied some ScummVM formatting conventions.
svn-id: r17430
Diffstat (limited to 'queen/sound.cpp')
-rw-r--r--queen/sound.cpp80
1 files changed, 40 insertions, 40 deletions
diff --git a/queen/sound.cpp b/queen/sound.cpp
index f982ce9d6c..0170d451bc 100644
--- a/queen/sound.cpp
+++ b/queen/sound.cpp
@@ -47,37 +47,37 @@ Sound *Sound::giveSound(SoundMixer *mixer, QueenEngine *vm, uint8 compression) {
if (!mixer->isReady())
return new SilentSound(mixer, vm);
- switch(compression) {
- case COMPRESSION_NONE:
- return new SBSound(mixer, vm);
- break;
- case COMPRESSION_MP3:
- #ifndef USE_MAD
- warning("Using MP3 compressed datafile, but MP3 support not compiled in");
- return new SilentSound(mixer, vm);
- #else
- return new MP3Sound(mixer, vm);
- #endif
- break;
- case COMPRESSION_OGG:
- #ifndef USE_VORBIS
- warning("Using OGG compressed datafile, but OGG support not compiled in");
- return new SilentSound(mixer, vm);
- #else
- return new OGGSound(mixer, vm);
- #endif
- break;
- case COMPRESSION_FLAC:
- #ifndef USE_FLAC
- warning("Using FLAC compressed datafile, but FLAC support not compiled in");
- return new SilentSound(mixer, vm);
- #else
- return new FLACSound(mixer, vm);
- #endif
- break;
- default:
- warning("Unknown compression type");
- return new SilentSound(mixer, vm);
+ switch (compression) {
+ case COMPRESSION_NONE:
+ return new SBSound(mixer, vm);
+ break;
+ case COMPRESSION_MP3:
+#ifndef USE_MAD
+ warning("Using MP3 compressed datafile, but MP3 support not compiled in");
+ return new SilentSound(mixer, vm);
+#else
+ return new MP3Sound(mixer, vm);
+#endif
+ break;
+ case COMPRESSION_OGG:
+#ifndef USE_VORBIS
+ warning("Using OGG compressed datafile, but OGG support not compiled in");
+ return new SilentSound(mixer, vm);
+#else
+ return new OGGSound(mixer, vm);
+#endif
+ break;
+ case COMPRESSION_FLAC:
+#ifndef USE_FLAC
+ warning("Using FLAC compressed datafile, but FLAC support not compiled in");
+ return new SilentSound(mixer, vm);
+#else
+ return new FLACSound(mixer, vm);
+#endif
+ break;
+ default:
+ warning("Unknown compression type");
+ return new SilentSound(mixer, vm);
}
}
@@ -161,15 +161,15 @@ void Sound::playSong(int16 songNum) {
int override = (_vm->resource()->isDemo()) ? _songDemo[songNum - 1].override : _song[songNum - 1].override;
switch (override) {
- // Override all songs
- case 1:
- break;
- // Alter song settings (such as volume) and exit
- case 2:
- _vm->music()->toggleVChange();
- default:
- return;
- break;
+ // Override all songs
+ case 1:
+ break;
+ // Alter song settings (such as volume) and exit
+ case 2:
+ _vm->music()->toggleVChange();
+ default:
+ return;
+ break;
}
_lastOverride = songNum;