diff options
| author | Max Horn | 2003-06-21 21:17:08 +0000 |
|---|---|---|
| committer | Max Horn | 2003-06-21 21:17:08 +0000 |
| commit | 7c332d7fdb8ae0356ab21368c4903aea4b9b8640 (patch) | |
| tree | 2276c452371b804477d3d2083e4d9d80accfca47 /scumm/smush | |
| parent | 1733bafbda15665dad525eb1d0be8ae4a71efd21 (diff) | |
| download | scummvm-rg350-7c332d7fdb8ae0356ab21368c4903aea4b9b8640.tar.gz scummvm-rg350-7c332d7fdb8ae0356ab21368c4903aea4b9b8640.tar.bz2 scummvm-rg350-7c332d7fdb8ae0356ab21368c4903aea4b9b8640.zip | |
modified & cleaned up the playStream/append code a bit; but this API really could stand some refinement
svn-id: r8592
Diffstat (limited to 'scumm/smush')
| -rw-r--r-- | scumm/smush/smush_mixer.cpp | 4 | ||||
| -rw-r--r-- | scumm/smush/smush_player.cpp | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/scumm/smush/smush_mixer.cpp b/scumm/smush/smush_mixer.cpp index 78f6c02e51..96a0a00ef0 100644 --- a/scumm/smush/smush_mixer.cpp +++ b/scumm/smush/smush_mixer.cpp @@ -131,9 +131,9 @@ bool SmushMixer::handleFrame() { if (_silentMixer == false) { if (_channels[i].mixer_index == -1) { - _channels[i].mixer_index = _mixer->playStream(NULL, -1, data, size, rate, flags); + _channels[i].mixer_index = _mixer->playStream(-1, data, size, rate, flags); } else { - _mixer->append(_channels[i].mixer_index, data, size, rate, flags); + _mixer->append(_channels[i].mixer_index, data, size); } } free(data); diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp index c9be3863f8..928dbc8f25 100644 --- a/scumm/smush/smush_player.cpp +++ b/scumm/smush/smush_player.cpp @@ -451,11 +451,10 @@ void SmushPlayer::handleImuseAction(Chunk &b) { } while (--count); if (_IACTchannel == -1) { - _IACTchannel = _scumm->_mixer->playStream(NULL, -1, output_data, 0x1000, 22050, + _IACTchannel = _scumm->_mixer->playStream(-1, output_data, 0x1000, 22050, SoundMixer::FLAG_STEREO | SoundMixer::FLAG_16BITS, -1, 200000); } else { - _scumm->_mixer->append(_IACTchannel, output_data, 0x1000, 22050, - SoundMixer::FLAG_STEREO | SoundMixer::FLAG_16BITS); + _scumm->_mixer->append(_IACTchannel, output_data, 0x1000); } bsize -= len; |