diff options
| author | Paweł Kołodziejski | 2004-04-11 18:57:44 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2004-04-11 18:57:44 +0000 |
| commit | f489a2ae75386deebbabc5e1d9b76fb2ba384886 (patch) | |
| tree | 63cf61749c97e7d2aa9d31cb3c3f4bce156afc5c | |
| parent | b05cc19d0d189d4aa9c5659c838b2c910dcf46f5 (diff) | |
| download | scummvm-rg350-f489a2ae75386deebbabc5e1d9b76fb2ba384886.tar.gz scummvm-rg350-f489a2ae75386deebbabc5e1d9b76fb2ba384886.tar.bz2 scummvm-rg350-f489a2ae75386deebbabc5e1d9b76fb2ba384886.zip | |
pull not pool
svn-id: r13546
| -rw-r--r-- | scumm/imuse_digi/dimuse.cpp | 4 | ||||
| -rw-r--r-- | scumm/imuse_digi/dimuse.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp index cb52b879fd..bbd4879e57 100644 --- a/scumm/imuse_digi/dimuse.cpp +++ b/scumm/imuse_digi/dimuse.cpp @@ -78,8 +78,8 @@ void IMuseDigital::resetState() { _nextSeqToPlay = 0; } -void IMuseDigital::poolDataForMixer(int32 pullSize, byte *mixerBuffer, AudioStream *stream) { - Common::StackLock lock(_mutex, "IMuseDigital::poolDataForMixer()"); +void IMuseDigital::pullDataForMixer(int32 pullSize, byte *mixerBuffer, AudioStream *stream) { + Common::StackLock lock(_mutex, "IMuseDigital::pullDataForMixer()"); for (int l = 0; l < MAX_DIGITAL_TRACKS + MAX_DIGITAL_FADETRACKS; l++) { if (_track[l]->stream == stream) { int32 mixer_size = pullSize; diff --git a/scumm/imuse_digi/dimuse.h b/scumm/imuse_digi/dimuse.h index 2e7b1906ae..9c29f3180d 100644 --- a/scumm/imuse_digi/dimuse.h +++ b/scumm/imuse_digi/dimuse.h @@ -93,7 +93,7 @@ private: int _curMusicCue; static void timer_handler(void *refConf); - void poolDataForMixer(int32 pullSize, byte *mixerBuffer, AudioStream *stream); + void pullDataForMixer(int32 pullSize, byte *mixerBuffer, AudioStream *stream); void callback(); void switchToNextRegion(int track); void allocSlot(int priority); |