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 /saga/music.cpp | |
| 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 'saga/music.cpp')
| -rw-r--r-- | saga/music.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/saga/music.cpp b/saga/music.cpp index d58c39676f..0e239fa81c 100644 --- a/saga/music.cpp +++ b/saga/music.cpp @@ -350,7 +350,7 @@ Music::~Music() { } bool Music::isPlaying() { - return _musicHandle.isActive() || _player->isPlaying(); + return _mixer->isSoundHandleActive(_musicHandle) || _player->isPlaying(); } // The Wyrmkeep release of Inherit The Earth features external MIDI files, so @@ -409,8 +409,7 @@ int Music::play(uint32 music_rn, uint16 flags) { _player->stopMusic(); - if (_musicHandle.isActive()) - _mixer->stopHandle(_musicHandle); + _mixer->stopHandle(_musicHandle); AudioStream *audioStream = NULL; MidiParser *parser; |