aboutsummaryrefslogtreecommitdiff
path: root/scumm/sound.cpp
diff options
context:
space:
mode:
authorPaweł Kołodziejski2003-01-26 14:26:03 +0000
committerPaweł Kołodziejski2003-01-26 14:26:03 +0000
commitdc7a8761363b348a5bc06102678d94628f2c9126 (patch)
treeb9a80932ac80a43728ad965b46fd93ebe26b7edc /scumm/sound.cpp
parent00f7e562fd9f7b17701d5ab22aa57bb0174f8549 (diff)
downloadscummvm-rg350-dc7a8761363b348a5bc06102678d94628f2c9126.tar.gz
scummvm-rg350-dc7a8761363b348a5bc06102678d94628f2c9126.tar.bz2
scummvm-rg350-dc7a8761363b348a5bc06102678d94628f2c9126.zip
added "implementation" of imGetMusicPosition
svn-id: r6550
Diffstat (limited to 'scumm/sound.cpp')
-rw-r--r--scumm/sound.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 4223c5623d..5d4282e5b8 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -987,6 +987,7 @@ void Sound::playBundleMusic(char * song) {
_currentSampleBundleMusic = 0;
_offsetSampleBundleMusic = 0;
_offsetBufBundleMusic = 0;
+ _bundleMusicPosition = 0;
_pauseBundleMusic = false;
_musicBundleToBeRemoved = false;
_musicBundleToBeChanged = false;
@@ -1045,6 +1046,7 @@ void Sound::bundleMusicHandler(Scumm * scumm) {
_offsetSampleBundleMusic = 0;
_offsetBufBundleMusic = 0;
_musicBundleToBeChanged = false;
+ _bundleMusicPosition = 0;
}
ptr = _musicBundleBufOutput;
@@ -1110,6 +1112,7 @@ void Sound::bundleMusicHandler(Scumm * scumm) {
_currentSampleBundleMusic = 0;
_offsetSampleBundleMusic = 0;
_offsetBufBundleMusic = 0;
+ _bundleMusicPosition = 0;
}
ptr = _musicBundleBufFinal;
@@ -1127,6 +1130,7 @@ void Sound::bundleMusicHandler(Scumm * scumm) {
return;
}
+ _bundleMusicPosition += final_size;
if (_bundleMusicTrack == -1) {
_bundleMusicTrack = _scumm->_mixer->playStream(NULL, _scumm->_mixer->_beginSlots - 1, buffer, final_size, rate,
SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_16BITS | SoundMixer::FLAG_STEREO, -1, 2000000);