aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Hesse2008-05-08 16:15:14 +0000
committerSven Hesse2008-05-08 16:15:14 +0000
commitcb9fd40a1b22072ed8d6d0c81e7cf76d4ea3e4ec (patch)
tree84f76cdaf1c456b4a2e424f70d334ff2a20310f5
parent18db41db506b1e18e050e8dded44dc8501b9bc8f (diff)
downloadscummvm-rg350-cb9fd40a1b22072ed8d6d0c81e7cf76d4ea3e4ec.tar.gz
scummvm-rg350-cb9fd40a1b22072ed8d6d0c81e7cf76d4ea3e4ec.tar.bz2
scummvm-rg350-cb9fd40a1b22072ed8d6d0c81e7cf76d4ea3e4ec.zip
Declaring BackgroundAtmosphere as kMusicSoundType
svn-id: r31950
-rw-r--r--engines/gob/sound/bgatmosphere.cpp4
-rw-r--r--engines/gob/sound/soundblaster.cpp2
-rw-r--r--engines/gob/sound/soundmixer.cpp5
-rw-r--r--engines/gob/sound/soundmixer.h2
4 files changed, 7 insertions, 6 deletions
diff --git a/engines/gob/sound/bgatmosphere.cpp b/engines/gob/sound/bgatmosphere.cpp
index 3c61f4f76a..f5a7fe0fdb 100644
--- a/engines/gob/sound/bgatmosphere.cpp
+++ b/engines/gob/sound/bgatmosphere.cpp
@@ -30,7 +30,9 @@
namespace Gob {
-BackgroundAtmosphere::BackgroundAtmosphere(Audio::Mixer &mixer) : SoundMixer(mixer) {
+BackgroundAtmosphere::BackgroundAtmosphere(Audio::Mixer &mixer) :
+ SoundMixer(mixer, Audio::Mixer::kMusicSoundType) {
+
_playMode = kPlayModeLinear;
_queuePos = -1;
_shaded = false;
diff --git a/engines/gob/sound/soundblaster.cpp b/engines/gob/sound/soundblaster.cpp
index cfa11b6ff9..eeedfaa3cb 100644
--- a/engines/gob/sound/soundblaster.cpp
+++ b/engines/gob/sound/soundblaster.cpp
@@ -27,7 +27,7 @@
namespace Gob {
-SoundBlaster::SoundBlaster(Audio::Mixer &mixer) : SoundMixer(mixer) {
+SoundBlaster::SoundBlaster(Audio::Mixer &mixer) : SoundMixer(mixer, Audio::Mixer::kSFXSoundType) {
_curSoundDesc = 0;
_compositionSamples = 0;
diff --git a/engines/gob/sound/soundmixer.cpp b/engines/gob/sound/soundmixer.cpp
index f85073ad61..1a287d782f 100644
--- a/engines/gob/sound/soundmixer.cpp
+++ b/engines/gob/sound/soundmixer.cpp
@@ -27,7 +27,7 @@
namespace Gob {
-SoundMixer::SoundMixer(Audio::Mixer &mixer) : _mixer(&mixer) {
+SoundMixer::SoundMixer(Audio::Mixer &mixer, Audio::Mixer::SoundType type) : _mixer(&mixer) {
_playingSound = 0;
_rate = _mixer->getOutputRate();
@@ -50,8 +50,7 @@ SoundMixer::SoundMixer(Audio::Mixer &mixer) : _mixer(&mixer) {
_fadeSamples = 0;
_curFadeSamples = 0;
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_handle,
- this, -1, 255, 0, false, true);
+ _mixer->playInputStream(type, &_handle, this, -1, 255, 0, false, true);
}
SoundMixer::~SoundMixer() {
diff --git a/engines/gob/sound/soundmixer.h b/engines/gob/sound/soundmixer.h
index e22cd7b473..5789885a99 100644
--- a/engines/gob/sound/soundmixer.h
+++ b/engines/gob/sound/soundmixer.h
@@ -37,7 +37,7 @@ namespace Gob {
class SoundMixer : public Audio::AudioStream {
public:
- SoundMixer(Audio::Mixer &mixer);
+ SoundMixer(Audio::Mixer &mixer, Audio::Mixer::SoundType type = Audio::Mixer::kPlainSoundType);
~SoundMixer();
virtual void play(SoundDesc &sndDesc, int16 repCount,