[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_mixer.cpp,1.6,1.7 smush_mixer.h,1.2,1.3
Max Horn
fingolfin at users.sourceforge.net
Sat Jun 21 13:41:02 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv28703
Modified Files:
smush_mixer.cpp smush_mixer.h
Log Message:
got rid of member var 'first'
Index: smush_mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_mixer.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- smush_mixer.cpp 21 Jun 2003 19:58:38 -0000 1.6
+++ smush_mixer.cpp 21 Jun 2003 20:40:34 -0000 1.7
@@ -35,7 +35,7 @@
for (int32 i = _mixer->_beginSlots; i < SoundMixer::NUM_CHANNELS; i++) {
_channels[i].id = -1;
_channels[i].chan = NULL;
- _channels[i].first = true;
+ _channels[i].mixer_index = -1;
}
}
@@ -68,7 +68,7 @@
if (_channels[i].chan == NULL || _channels[i].id == -1) {
_channels[i].chan = c;
_channels[i].id = track;
- _channels[i].first = true;
+ _channels[i].mixer_index = -1;
_nextIndex = i + 1;
return true;
}
@@ -78,7 +78,7 @@
if (_channels[i].chan == NULL || _channels[i].id == -1) {
_channels[i].chan = c;
_channels[i].id = track;
- _channels[i].first = true;
+ _channels[i].mixer_index = -1;
_nextIndex = i + 1;
return true;
}
@@ -90,7 +90,7 @@
warning("channel %d : %p(%d, %d) %d %d", i, (void *)_channels[i].chan,
_channels[i].chan ? _channels[i].chan->getTrackIdentifier() : -1,
_channels[i].chan ? _channels[i].chan->isTerminated() : 1,
- _channels[i].first, _channels[i].mixer_index);
+ _channels[i].mixer_index);
}
error("SmushMixer::add_channel() : no more channel available");
@@ -134,9 +134,8 @@
}
if (_silentMixer == false) {
- if (_channels[i].first) {
+ if (_channels[i].mixer_index == -1) {
_channels[i].mixer_index = _mixer->playStream(NULL, -1, data, size, rate, flags);
- _channels[i].first = false;
} else {
_mixer->append(_channels[i].mixer_index, data, size, rate, flags);
}
Index: smush_mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_mixer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- smush_mixer.h 30 Apr 2003 11:26:36 -0000 1.2
+++ smush_mixer.h 21 Jun 2003 20:40:34 -0000 1.3
@@ -32,7 +32,6 @@
struct {
int id;
SmushChannel *chan;
- bool first;
int mixer_index;
} _channels[SoundMixer::NUM_CHANNELS];
More information about the Scummvm-git-logs
mailing list