[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.101,1.102

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30638/scummvm/scumm/imuse_digi

Modified Files:
	dimuse.cpp 
Log Message:
moved a bit

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- dimuse.cpp	19 Jun 2004 16:00:11 -0000	1.101
+++ dimuse.cpp	19 Jun 2004 17:22:18 -0000	1.102
@@ -203,19 +203,6 @@
 			track->mixerVol = vol;
 			track->mixerPan = pan;
 
-			if (track->stream2) {
-				if (_vm->_mixer->isReady()) {
-					if (!track->started) {
-						track->started = true;
-						_vm->_mixer->playInputStream(&track->handle, track->stream2, false, vol, pan, -1, false);
-					} else {
-						_vm->_mixer->setChannelVolume(track->handle, vol);
-						_vm->_mixer->setChannelBalance(track->handle, pan);
-					}
-					continue;
-				}
-			}
-
 			if (track->stream) {
 				byte *data = NULL;
 				int32 result = 0;
@@ -296,6 +283,16 @@
 					mixer_size -= result;
 					assert(mixer_size >= 0);
 				} while (mixer_size != 0);
+			} else if (track->stream2) {
+				if (_vm->_mixer->isReady()) {
+					if (!track->started) {
+						track->started = true;
+						_vm->_mixer->playInputStream(&track->handle, track->stream2, false, vol, pan, -1, false);
+					} else {
+						_vm->_mixer->setChannelVolume(track->handle, vol);
+						_vm->_mixer->setChannelBalance(track->handle, pan);
+					}
+				}
 			}
 		}
 	}