[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_mixer.cpp,1.22,1.23 smush_player.cpp,1.75,1.76
Max Horn
fingolfin at users.sourceforge.net
Sat Dec 20 17:18:02 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.63,1.64 imuse_digi.h,1.17,1.18 sound.cpp,1.282,1.283
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.140,1.141 mixer.h,1.62,1.63
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv26526/scumm/smush
Modified Files:
smush_mixer.cpp smush_player.cpp
Log Message:
Cleaned up SoundMixer::newStream() a bit (I plan to replace all usages of this by playInputStream(), this cleanup eases this a bit)
Index: smush_mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_mixer.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- smush_mixer.cpp 21 Dec 2003 00:40:42 -0000 1.22
+++ smush_mixer.cpp 21 Dec 2003 01:17:02 -0000 1.23
@@ -122,11 +122,9 @@
}
if (_silentMixer == false) {
- if (_channels[i].handle == 0) {
- _mixer->newStream(&_channels[i].handle, data, size, rate, flags, 500000, 255, 0);
- } else {
- _mixer->appendStream(_channels[i].handle, data, size);
- }
+ if (_channels[i].handle == 0)
+ _mixer->newStream(&_channels[i].handle, rate, flags, 500000);
+ _mixer->appendStream(_channels[i].handle, data, size);
}
free(data);
}
Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- smush_player.cpp 21 Dec 2003 00:40:42 -0000 1.75
+++ smush_player.cpp 21 Dec 2003 01:17:02 -0000 1.76
@@ -471,12 +471,9 @@
}
} while (--count);
- if (_IACTchannel == 0) {
- _scumm->_mixer->newStream(&_IACTchannel, output_data, 0x1000, 22050,
- SoundMixer::FLAG_STEREO | SoundMixer::FLAG_16BITS, 200000, 255, 0);
- } else {
- _scumm->_mixer->appendStream(_IACTchannel, output_data, 0x1000);
- }
+ if (_IACTchannel == 0)
+ _scumm->_mixer->newStream(&_IACTchannel, 22050, SoundMixer::FLAG_STEREO | SoundMixer::FLAG_16BITS, 200000);
+ _scumm->_mixer->appendStream(_IACTchannel, output_data, 0x1000);
bsize -= len;
d_src += len;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.63,1.64 imuse_digi.h,1.17,1.18 sound.cpp,1.282,1.283
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.140,1.141 mixer.h,1.62,1.63
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list