Merge pull request #907 from somaen/fixPS2Audio

EMI: Make SCXTrack behave like MP3Track in regards to isPlaying
This commit is contained in:
Joel Teichroeb 2014-06-16 16:24:12 -07:00
commit 11c65aeab2
2 changed files with 8 additions and 1 deletions

View File

@ -49,4 +49,11 @@ bool SCXTrack::openSound(const Common::String &soundName, Common::SeekableReadSt
return true;
}
bool SCXTrack::isPlaying() {
if (!_handle)
return false;
return g_system->getMixer()->isSoundHandleActive(*_handle);
}
} // end of namespace Grim

View File

@ -39,7 +39,7 @@ public:
SCXTrack(Audio::Mixer::SoundType soundType);
~SCXTrack();
bool openSound(const Common::String &soundName, Common::SeekableReadStream *file) override;
bool isPlaying() override { return true; }
bool isPlaying() override;
};
}