[Scummvm-cvs-logs] SF.net SVN: scummvm: [31950] scummvm/trunk/engines/gob/sound
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Thu May 8 18:15:14 CEST 2008
Revision: 31950
http://scummvm.svn.sourceforge.net/scummvm/?rev=31950&view=rev
Author: drmccoy
Date: 2008-05-08 09:15:14 -0700 (Thu, 08 May 2008)
Log Message:
-----------
Declaring BackgroundAtmosphere as kMusicSoundType
Modified Paths:
--------------
scummvm/trunk/engines/gob/sound/bgatmosphere.cpp
scummvm/trunk/engines/gob/sound/soundblaster.cpp
scummvm/trunk/engines/gob/sound/soundmixer.cpp
scummvm/trunk/engines/gob/sound/soundmixer.h
Modified: scummvm/trunk/engines/gob/sound/bgatmosphere.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/bgatmosphere.cpp 2008-05-08 15:51:02 UTC (rev 31949)
+++ scummvm/trunk/engines/gob/sound/bgatmosphere.cpp 2008-05-08 16:15:14 UTC (rev 31950)
@@ -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;
Modified: scummvm/trunk/engines/gob/sound/soundblaster.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/soundblaster.cpp 2008-05-08 15:51:02 UTC (rev 31949)
+++ scummvm/trunk/engines/gob/sound/soundblaster.cpp 2008-05-08 16:15:14 UTC (rev 31950)
@@ -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;
Modified: scummvm/trunk/engines/gob/sound/soundmixer.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/soundmixer.cpp 2008-05-08 15:51:02 UTC (rev 31949)
+++ scummvm/trunk/engines/gob/sound/soundmixer.cpp 2008-05-08 16:15:14 UTC (rev 31950)
@@ -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 @@
_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() {
Modified: scummvm/trunk/engines/gob/sound/soundmixer.h
===================================================================
--- scummvm/trunk/engines/gob/sound/soundmixer.h 2008-05-08 15:51:02 UTC (rev 31949)
+++ scummvm/trunk/engines/gob/sound/soundmixer.h 2008-05-08 16:15:14 UTC (rev 31950)
@@ -37,7 +37,7 @@
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,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list