[Scummvm-cvs-logs] SF.net SVN: scummvm: [32960] scummvm/trunk/engines/scumm/imuse_digi/ dimuse_track.h

[fingolfin at users.sourceforge.net]

Revision: 32960
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32960&view=rev
Author:   fingolfin
Date:     2008-07-08 03:29:35 -0700 (Tue, 08 Jul 2008)

Log Message:
-----------
Remove reference to kPlainSoundType

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.h

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.h
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.h	2008-07-08 06:00:39 UTC (rev 32959)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.h	2008-07-08 10:29:35 UTC (rev 32960)
@@ -85,13 +85,15 @@
 	int getPan() const { return (pan != 64) ? 2 * pan - 127 : 0; }
 	int getVol() const { return vol / 1000; }
 	Audio::Mixer::SoundType getType() const {
-		Audio::Mixer::SoundType type = Audio::Mixer::kPlainSoundType;
+		Audio::Mixer::SoundType type;
 		if (volGroupId == 1)
 			type = Audio::Mixer::kSpeechSoundType;
 		else if (volGroupId == 2)
 			type = Audio::Mixer::kSFXSoundType;
 		else if (volGroupId == 3)
 			type = Audio::Mixer::kMusicSoundType;
+		else
+			error("Track::getType(): invalid sound type");
 		return type;
 	}
 };


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