[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.67,1.68

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv24341

Modified Files:
	mixer.cpp 
Log Message:
verify chan != 0 even on WinCE

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- mixer.cpp	12 Jul 2003 10:12:41 -0000	1.67
+++ mixer.cpp	12 Jul 2003 11:33:13 -0000	1.68
@@ -191,33 +191,33 @@
 void SoundMixer::appendStream(int index, void *sound, uint32 size) {
 	StackLock lock(_mutex);
 
+	ChannelStream *chan;
 #ifndef _WIN32_WCE
-	ChannelStream *chan = dynamic_cast<ChannelStream *>(_channels[index]);
+	chan = dynamic_cast<ChannelStream *>(_channels[index]);
+#else
+	chan = (ChannelStream*)_channels[index];
+#endif
 	if (!chan) {
 		error("Trying to append to a nonexistant stream %d", index);
 	} else {
 		chan->append(sound, size);
 	}
-#else
-	ChannelStream *chan = (ChannelStream*)_channels[index];
-	chan->append(sound, size);
-#endif
 }
 
 void SoundMixer::endStream(int index) {
 	StackLock lock(_mutex);
 
+	ChannelStream *chan;
 #ifndef _WIN32_WCE
-	ChannelStream *chan = dynamic_cast<ChannelStream *>(_channels[index]);
+	chan = dynamic_cast<ChannelStream *>(_channels[index]);
+#else
+	chan = (ChannelStream*)_channels[index];
+#endif
 	if (!chan) {
 		error("Trying to end a nonexistant streamer : %d", index);
 	} else {
 		chan->finish();
 	}
-#else
-	ChannelStream *chan = (ChannelStream*)_channels[index];
-	chan->finish();
-#endif
 }
 
 int SoundMixer::insertChannel(PlayingSoundHandle *handle, Channel *chan) {