libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-29 14:42:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved GMM sound setting config for Parallaction

Browse Source 
svn-id: r33181
This commit is contained in:
Christopher Page 2008-07-21 21:11:28 +00:00
parent 34d3d74b97
commit 0cae5552db
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/parallaction/exec_ns.cpp
View File

@ -538,7 +538,7 @@ uint16 Parallaction::runZone(ZonePtr z) {
break;
case kZoneHear:
_soundMan->playSfx(z->u.hear->_name, z->u.hear->_channel, (z->_flags & kFlagsLooping) == kFlagsLooping, 60);
_soundMan->playSfx(z->u.hear->_name, z->u.hear->_channel, (z->_flags & kFlagsLooping) == kFlagsLooping);
break;
case kZoneSpeak:

6
engines/parallaction/parallaction.cpp
View File

@ -139,6 +139,7 @@ int Parallaction::init() {
_debugger = new Debugger(this);
setupBalloonManager();
syncSoundSettings();
return 0;
}
@ -505,6 +506,11 @@ void Parallaction::freeZones() {
return;
}
void Parallaction::syncSoundSettings() {
_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume") / 6);
_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume"));
}
enum {
WALK_LEFT = 0,

2
engines/parallaction/parallaction.h
View File

@ -270,6 +270,8 @@ public:
void pauseJobs();
void resumeJobs();
virtual void syncSoundSettings();
void finalizeWalk(Character &character);
int16 selectWalkFrame(Character &character, const Common::Point& pos, const WalkNodePtr to);
void clipMove(Common::Point& pos, const Common::Point& to);

3
engines/parallaction/sound.cpp
View File

@ -387,7 +387,8 @@ void AmigaSoundMan::playSfx(const char *filename, uint channel, bool looping, in
rate = ch->header.samplesPerSec;
}
_mixer->playRaw(Audio::Mixer::kSFXSoundType, &ch->handle, ch->data, ch->dataSize, rate, flags, -1, volume, 0, loopStart, loopEnd);
_mixer->playRaw(Audio::Mixer::kSFXSoundType, &ch->handle, ch->data, ch->dataSize, rate, flags, -1,
Audio::Mixer::kMaxChannelVolume, 0, loopStart, loopEnd);
}
void AmigaSoundMan::stopSfx(uint channel) {