diff options
author | Max Horn | 2005-03-12 18:56:09 +0000 |
---|---|---|
committer | Max Horn | 2005-03-12 18:56:09 +0000 |
commit | 7cd2cb2b1700b85d48aed8898b08b49b9b46ebf8 (patch) | |
tree | 7849605aa45912d9cbe65dbb68b2b450bd32b023 /scumm | |
parent | 8de216f3aec1dcee16fc0ab9974da4087bac5252 (diff) | |
download | scummvm-rg350-7cd2cb2b1700b85d48aed8898b08b49b9b46ebf8.tar.gz scummvm-rg350-7cd2cb2b1700b85d48aed8898b08b49b9b46ebf8.tar.bz2 scummvm-rg350-7cd2cb2b1700b85d48aed8898b08b49b9b46ebf8.zip |
PlayingSoundHandle -> SoundHandle; also, turned the handle activity check into a mixer method
svn-id: r17106
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/imuse_digi/dimuse.h | 2 | ||||
-rw-r--r-- | scumm/imuse_digi/dimuse_script.cpp | 2 | ||||
-rw-r--r-- | scumm/smush/smush_mixer.cpp | 4 | ||||
-rw-r--r-- | scumm/smush/smush_mixer.h | 2 | ||||
-rw-r--r-- | scumm/smush/smush_player.cpp | 2 | ||||
-rw-r--r-- | scumm/smush/smush_player.h | 4 | ||||
-rw-r--r-- | scumm/sound.cpp | 4 | ||||
-rw-r--r-- | scumm/sound.h | 4 | ||||
-rw-r--r-- | scumm/string.cpp | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/scumm/imuse_digi/dimuse.h b/scumm/imuse_digi/dimuse.h index bbdc56a089..cb8e9892c6 100644 --- a/scumm/imuse_digi/dimuse.h +++ b/scumm/imuse_digi/dimuse.h @@ -77,7 +77,7 @@ private: int32 mixerFlags; ImuseDigiSndMgr::soundStruct *soundHandle; - PlayingSoundHandle handle; + SoundHandle handle; AppendableAudioStream *stream; AudioStream *stream2; diff --git a/scumm/imuse_digi/dimuse_script.cpp b/scumm/imuse_digi/dimuse_script.cpp index 356e004bdb..8a2e77f283 100644 --- a/scumm/imuse_digi/dimuse_script.cpp +++ b/scumm/imuse_digi/dimuse_script.cpp @@ -279,7 +279,7 @@ int IMuseDigital::getSoundStatus(int sound) const { for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) { Track *track = _track[l]; if (track->soundId == sound) { - if ((track->stream2 && track->handle.isActive()) || + if ((track->stream2 && _vm->_mixer->isSoundHandleActive(track->handle)) || (track->stream && track->used && !track->readyToRemove)) { return 1; } diff --git a/scumm/smush/smush_mixer.cpp b/scumm/smush/smush_mixer.cpp index 791b689491..c787f3aafc 100644 --- a/scumm/smush/smush_mixer.cpp +++ b/scumm/smush/smush_mixer.cpp @@ -69,7 +69,7 @@ void SmushMixer::addChannel(SmushChannel *c) { } for (i = 0; i < NUM_CHANNELS; i++) { - if ((_channels[i].chan == NULL || _channels[i].id == -1) && !_channels[i].handle.isActive()) { + if ((_channels[i].chan == NULL || _channels[i].id == -1) && !_mixer->isSoundHandleActive(_channels[i].handle)) { _channels[i].chan = c; _channels[i].id = track; return; @@ -120,7 +120,7 @@ bool SmushMixer::handleFrame() { } if (_mixer->isReady()) { - if (!_channels[i].handle.isActive()) { + if (!_mixer->isSoundHandleActive(_channels[i].handle)) { _channels[i].stream = makeAppendableAudioStream(rate, flags, 500000); _mixer->playInputStream(SoundMixer::kSFXSoundType, &_channels[i].handle, _channels[i].stream); } diff --git a/scumm/smush/smush_mixer.h b/scumm/smush/smush_mixer.h index 051303997e..b46366d182 100644 --- a/scumm/smush/smush_mixer.h +++ b/scumm/smush/smush_mixer.h @@ -39,7 +39,7 @@ private: struct channels { int id; SmushChannel *chan; - PlayingSoundHandle handle; + SoundHandle handle; AppendableAudioStream *stream; } _channels[NUM_CHANNELS]; diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp index 093108082e..bf67ee2ed0 100644 --- a/scumm/smush/smush_player.cpp +++ b/scumm/smush/smush_player.cpp @@ -507,7 +507,7 @@ void SmushPlayer::handleIACT(Chunk &b) { } } while (--count); - if (!_IACTchannel.isActive()) { + if (!_vm->_mixer->isSoundHandleActive(_IACTchannel)) { _IACTstream = makeAppendableAudioStream(22050, SoundMixer::FLAG_STEREO | SoundMixer::FLAG_16BITS, 400000); _vm->_mixer->playInputStream(SoundMixer::kSFXSoundType, &_IACTchannel, _IACTstream); } diff --git a/scumm/smush/smush_player.h b/scumm/smush/smush_player.h index eeb99a2d4f..1b3a656ef1 100644 --- a/scumm/smush/smush_player.h +++ b/scumm/smush/smush_player.h @@ -56,10 +56,10 @@ private: bool _skips[37]; int32 _frame; - PlayingSoundHandle _IACTchannel; + SoundHandle _IACTchannel; AppendableAudioStream *_IACTstream; - PlayingSoundHandle _compressedFileSoundHandle; + SoundHandle _compressedFileSoundHandle; bool _compressedFileMode; File _compressedFile; byte _IACToutput[4096]; diff --git a/scumm/sound.cpp b/scumm/sound.cpp index f665736b72..e6bbd889df 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -572,7 +572,7 @@ void Sound::processSfxQueues() { if (_vm->_imuseDigital) { finished = !isSoundRunning(kTalkSoundID); } else { - finished = !_talkChannelHandle.isActive(); + finished = !_vm->_mixer->isSoundHandleActive(_talkChannelHandle); } if ((uint) act < 0x80 && ((_vm->_version == 8) || (_vm->_version <= 7 && !_vm->_string[0].no_talk_anim))) { @@ -609,7 +609,7 @@ static int compareMP3OffsetTable(const void *a, const void *b) { return ((const MP3OffsetTable *)a)->org_offset - ((const MP3OffsetTable *)b)->org_offset; } -void Sound::startTalkSound(uint32 offset, uint32 b, int mode, PlayingSoundHandle *handle) { +void Sound::startTalkSound(uint32 offset, uint32 b, int mode, SoundHandle *handle) { int num = 0, i; int size = 0; byte *sound; diff --git a/scumm/sound.h b/scumm/sound.h index 6b3830d323..d86b7c5c45 100644 --- a/scumm/sound.h +++ b/scumm/sound.h @@ -84,7 +84,7 @@ protected: int16 _currentCDSound; int16 _currentMusic; public: - PlayingSoundHandle _talkChannelHandle; // Handle of mixer channel actor is talking on + SoundHandle _talkChannelHandle; // Handle of mixer channel actor is talking on bool _soundsPaused; byte _sfxMode; @@ -97,7 +97,7 @@ public: void processSoundQues(); void setOverrideFreq(int freq); void playSound(int soundID, int heOffset, int heChannel, int heFlags); - void startTalkSound(uint32 offset, uint32 b, int mode, PlayingSoundHandle *handle = NULL); + void startTalkSound(uint32 offset, uint32 b, int mode, SoundHandle *handle = NULL); void stopTalkSound(); bool isMouthSyncOff(uint pos); int isSoundRunning(int sound) const; diff --git a/scumm/string.cpp b/scumm/string.cpp index c1748e3669..992179791e 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -370,7 +370,7 @@ loc_avoid_ks_fe: // Special case for games using imuse digital.for sound } else if ((_gameId == GID_LOOM256) && !ConfMan.getBool("subtitles") && (_sound->pollCD())) { // Special case for loomcd, since it only uses CD audio.for sound - } else if (!ConfMan.getBool("subtitles") && (_haveMsg == 0xFE || _sound->_talkChannelHandle.isActive())) { + } else if (!ConfMan.getBool("subtitles") && (_haveMsg == 0xFE || _mixer->isSoundHandleActive(_sound->_talkChannelHandle))) { // Subtitles are turned off, and there is a voice version // of this message -> don't print it. } else |