[Scummvm-cvs-logs] CVS: scummvm/scumm/smush scumm_renderer.cpp,1.18,1.19
Pawe? Ko?odziejski
aquadran at users.sourceforge.net
Tue Oct 15 14:56:04 CEST 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,1.60,1.61 imuse.h,1.13,1.14 sound.cpp,1.32,1.33
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.17,1.18 mixer.h,1.9,1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory usw-pr-cvs1:/tmp/cvs-serv10755/scumm/smush
Modified Files:
scumm_renderer.cpp
Log Message:
changes to imuse
Index: scumm_renderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/scumm_renderer.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- scumm_renderer.cpp 15 Oct 2002 06:53:42 -0000 1.18
+++ scumm_renderer.cpp 15 Oct 2002 21:55:03 -0000 1.19
@@ -51,8 +51,8 @@
bool update();
};
-ScummMixer::ScummMixer(SoundMixer * m) : _mixer(m), _nextIndex(0) {
- for(int32 i = 0; i < SoundMixer::NUM_CHANNELS; i++) {
+ScummMixer::ScummMixer(SoundMixer * m) : _mixer(m), _nextIndex(_mixer->_beginSlots) {
+ for(int32 i = _mixer->_beginSlots; i < SoundMixer::NUM_CHANNELS; i++) {
_channels[i].id = -1;
_channels[i].chan = 0;
_channels[i].first = true;
@@ -69,7 +69,7 @@
_Channel * ScummMixer::findChannel(int32 track) {
debug(9, "scumm_mixer::findChannel(%d)", track);
- for(int32 i = 0; i < SoundMixer::NUM_CHANNELS; i++) {
+ for(int32 i = _mixer->_beginSlots; i < SoundMixer::NUM_CHANNELS; i++) {
if(_channels[i].id == track)
return _channels[i].chan;
}
@@ -82,11 +82,11 @@
debug(9, "ScummMixer::addChannel(%d)", track);
- for(i = 0; i < SoundMixer::NUM_CHANNELS; i++) {
+ for(i = _mixer->_beginSlots; i < SoundMixer::NUM_CHANNELS; i++) {
if(_channels[i].id == track)
warning("mixer::addChannel(%d) : channel already exist !", track);
}
- if(_nextIndex >= SoundMixer::NUM_CHANNELS) _nextIndex = 0;
+ if(_nextIndex >= SoundMixer::NUM_CHANNELS) _nextIndex = _mixer->_beginSlots;
for(i = _nextIndex; i < SoundMixer::NUM_CHANNELS; i++) {
if(_channels[i].chan == 0 || _channels[i].id == -1) {
@@ -98,7 +98,7 @@
}
}
- for(i = 0; i < _nextIndex; i++) {
+ for(i = _mixer->_beginSlots; i < _nextIndex; i++) {
if(_channels[i].chan == 0 || _channels[i].id == -1) {
_channels[i].chan = c;
_channels[i].id = track;
@@ -110,7 +110,7 @@
fprintf(stderr, "_nextIndex == %d\n", _nextIndex);
- for(i = 0; i < SoundMixer::NUM_CHANNELS; i++) {
+ for(i = _mixer->_beginSlots; i < SoundMixer::NUM_CHANNELS; i++) {
fprintf(stderr, "channel %d : %p(%ld, %d) %d %d\n", i, _channels[i].chan,
_channels[i].chan ? _channels[i].chan->getTrackIdentifier() : -1,
_channels[i].chan ? _channels[i].chan->isTerminated() : 1,
@@ -123,7 +123,7 @@
bool ScummMixer::handleFrame() {
debug(9, "ScummMixer::handleFrame()");
- for(int i = 0; i < SoundMixer::NUM_CHANNELS; i++) {
+ for(int i = _mixer->_beginSlots; i < SoundMixer::NUM_CHANNELS; i++) {
if(_channels[i].id != -1) {
debug(9, "updating channel %d (%p)", _channels[i].id, _channels[i].chan);
if(_channels[i].chan->isTerminated()) {
@@ -181,7 +181,7 @@
bool ScummMixer::stop() {
debug(9, "ScummMixer::stop()");
- for(int i = 0; i < SoundMixer::NUM_CHANNELS; i++) {
+ for(int i = _mixer->_beginSlots; i < SoundMixer::NUM_CHANNELS; i++) {
if(_channels[i].id != -1) {
delete _channels[i].chan;
_channels[i].id = -1;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,1.60,1.61 imuse.h,1.13,1.14 sound.cpp,1.32,1.33
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.17,1.18 mixer.h,1.9,1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list