[Scummvm-cvs-logs] SF.net SVN: scummvm: [33009] scummvm/trunk/engines

[fingolfin at users.sourceforge.net]

Revision: 33009
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33009&view=rev
Author:   fingolfin
Date:     2008-07-11 13:28:14 -0700 (Fri, 11 Jul 2008)

Log Message:
-----------
Don't use kPlainSoundType if you don't have to

Modified Paths:
--------------
    scummvm/trunk/engines/gob/sound/soundmixer.h
    scummvm/trunk/engines/igor/igor.cpp

Modified: scummvm/trunk/engines/gob/sound/soundmixer.h
===================================================================
--- scummvm/trunk/engines/gob/sound/soundmixer.h	2008-07-11 20:10:14 UTC (rev 33008)
+++ scummvm/trunk/engines/gob/sound/soundmixer.h	2008-07-11 20:28:14 UTC (rev 33009)
@@ -37,7 +37,7 @@
 
 class SoundMixer : public Audio::AudioStream {
 public:
-	SoundMixer(Audio::Mixer &mixer, Audio::Mixer::SoundType type = Audio::Mixer::kPlainSoundType);
+	SoundMixer(Audio::Mixer &mixer, Audio::Mixer::SoundType type);
 	~SoundMixer();
 
 	virtual void play(SoundDesc &sndDesc, int16 repCount,

Modified: scummvm/trunk/engines/igor/igor.cpp
===================================================================
--- scummvm/trunk/engines/igor/igor.cpp	2008-07-11 20:10:14 UTC (rev 33008)
+++ scummvm/trunk/engines/igor/igor.cpp	2008-07-11 20:28:14 UTC (rev 33009)
@@ -404,7 +404,7 @@
 	debugC(9, kDebugEngine, "playSound() %d", num);
 	--num;
 	int soundOffset = -1;
-	Audio::Mixer::SoundType soundType = Audio::Mixer::kPlainSoundType;
+	Audio::Mixer::SoundType soundType;
 	Audio::SoundHandle *soundHandle = 0;
 	if (type == 1) {
 		if (_mixer->isSoundHandleActive(_sfxHandle)) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.