diff options
| author | Max Horn | 2002-07-07 21:27:06 +0000 |
|---|---|---|
| committer | Max Horn | 2002-07-07 21:27:06 +0000 |
| commit | aec25305294920da84a7d0721a2fd4e7f2547c74 (patch) | |
| tree | 4feb676b31a3af318673eaeac0d9d45a2840053d /insane.cpp | |
| parent | 99bd8afcd479058aa679a0e1b8e766af80e44db6 (diff) | |
| download | scummvm-rg350-aec25305294920da84a7d0721a2fd4e7f2547c74.tar.gz scummvm-rg350-aec25305294920da84a7d0721a2fd4e7f2547c74.tar.bz2 scummvm-rg350-aec25305294920da84a7d0721a2fd4e7f2547c74.zip | |
got rid of some g_scumm uses
svn-id: r4482
Diffstat (limited to 'insane.cpp')
| -rw-r--r-- | insane.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/insane.cpp b/insane.cpp index 36a7625ed0..f149d8109c 100644 --- a/insane.cpp +++ b/insane.cpp @@ -150,7 +150,7 @@ void SmushPlayer::parseIACT() if (idx == MAX_STREAMER) { for (idx = 0; idx < MAX_STREAMER; idx++) { - if (_imusTrk[idx] == 0 && g_scumm->_mixer->_channels[idx] == NULL) { + if (_imusTrk[idx] == 0 && g_mixer->_channels[idx] == NULL) { _imusTrk[idx] = trk; _imusSize[idx] = 0; new_mixer = true; @@ -252,9 +252,9 @@ void SmushPlayer::parseIACT() trk, bpos, _imusRate[idx], _imusSubSize[idx]); if (new_mixer) { - g_scumm->_mixer->play_stream(NULL, idx, buf, bpos, _imusRate[idx], flags); + g_mixer->play_stream(NULL, idx, buf, bpos, _imusRate[idx], flags); } else { - g_scumm->_mixer->append(idx, buf, bpos, _imusRate[idx], flags); + g_mixer->append(idx, buf, bpos, _imusRate[idx], flags); } /* FIXME: append with re-used idx may cause problems @@ -795,7 +795,7 @@ void SmushPlayer::parsePSAD() // FIXME: Needs to append to if (idx == MAX_STREAMER) { for (idx = 0; idx < MAX_STREAMER; idx++) { - if (_psadTrk[idx] == 0 && g_scumm->_mixer->_channels[idx] == NULL) { + if (_psadTrk[idx] == 0 && g_mixer->_channels[idx] == NULL) { _psadTrk[idx] = trk; _saudSize[idx] = 0; new_mixer = true; @@ -846,10 +846,10 @@ void SmushPlayer::parsePSAD() // FIXME: Needs to append to debug(3, "trk %d: SDAT part len 0x%x rate %d", trk, sublen, _strkRate[idx]); if (new_mixer) { - g_scumm->_mixer->play_stream(NULL, idx, buf, sublen, _strkRate[idx], + g_mixer->play_stream(NULL, idx, buf, sublen, _strkRate[idx], SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE); } else { - g_scumm->_mixer->append(idx, buf, sublen, + g_mixer->append(idx, buf, sublen, _strkRate[idx], SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE); } break; |