libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-24 05:01:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

EMI: When music quality is changed, immediately switch all active music tracks to the new quality.

Browse Source
This commit is contained in:
Joni Vähämäki 2014-07-20 14:30:05 +03:00
parent 94f8749045
commit 2d087f405e
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
engines/grim/emi/sound/emisound.cpp
View File

@ -507,7 +507,7 @@ void EMISound::initMusicTable() {
if (_musicTable == nullptr) { if (_musicTable == nullptr) {
tableLoadErrorDialog("Textures/FullMonkeyMap2.imt"); tableLoadErrorDialog("Textures/FullMonkeyMap2.imt");
} }
_musicPrefix = "Textures/spago/"; // Hardcode the high-quality music for now. _musicPrefix = "Textures/spago/"; // Default to high-quality music.
} }
} }
@ -524,6 +524,40 @@ void EMISound::selectMusicSet(int setId) {
} else { } else {
error("EMISound::selectMusicSet - Unknown setId %d", setId); error("EMISound::selectMusicSet - Unknown setId %d", setId);
} }
// Immediately switch all currently active music tracks to the new quality.
for (uint32 i = 0; i < NUM_CHANNELS; ++i) {
SoundTrack *track = _channels[i];
if (track && track->getSoundType() == Audio::Mixer::kMusicSoundType) {
_channels[i] = restartTrack(track);
delete track;
}
}
for (uint32 i = 0; i < _stateStack.size(); ++i) {
SoundTrack *track = _stateStack[i]._track;
if (track) {
_stateStack[i]._track = restartTrack(track);
delete track;
}
}
}
SoundTrack *EMISound::restartTrack(SoundTrack *track) {
Audio::Timestamp pos = track->getPos();
SoundTrack *newTrack = initTrack(track->getSoundName(), track->getSoundType(), &pos);
if (newTrack) {
newTrack->setVolume(track->getVolume());
newTrack->setBalance(track->getBalance());
newTrack->setFadeMode(track->getFadeMode());
newTrack->setFade(track->getFade());
if (track->isPlaying()) {
newTrack->play();
}
if (track->isPaused()) {
newTrack->pause();
}
}
return newTrack;
} }
void EMISound::pushStateToStack() { void EMISound::pushStateToStack() {

1
engines/grim/emi/sound/emisound.h
View File

@ -117,6 +117,7 @@ private:
void freeAllChannels(); void freeAllChannels();
void freeLoadedSounds(); void freeLoadedSounds();
SoundTrack *initTrack(const Common::String &soundName, Audio::Mixer::SoundType soundType, const Audio::Timestamp *start = nullptr) const; SoundTrack *initTrack(const Common::String &soundName, Audio::Mixer::SoundType soundType, const Audio::Timestamp *start = nullptr) const;
SoundTrack *restartTrack(SoundTrack *track);
bool startSound(const char *soundName, Audio::Mixer::SoundType soundType, int volume, int pan); bool startSound(const char *soundName, Audio::Mixer::SoundType soundType, int volume, int pan);
void saveTrack(SoundTrack *track, SaveGame *savedState); void saveTrack(SoundTrack *track, SaveGame *savedState);
SoundTrack *restoreTrack(SaveGame *savedState); SoundTrack *restoreTrack(SaveGame *savedState);