thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Start of volume support + mixer pause

Browse source 
svn-id: r4169
This commit is contained in:
Nicolas Bacca 2002-05-01 22:36:15 +00:00
parent 9f5d9137f3
commit cdb1af9ad2
2 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
main.cpp
View file

@ -124,6 +124,9 @@ int main(int argc, char *argv[])
} else { } else {
Scumm *scumm = Scumm::createFromDetector(&detector, system); Scumm *scumm = Scumm::createFromDetector(&detector, system);
g_scumm = scumm; g_scumm = scumm;
g_scumm->_sound_volume_master = 0;
g_scumm->_sound_volume_music = detector._music_volume;
g_scumm->_sound_volume_sfx = detector._sfx_volume;
/* bind to Gui */ /* bind to Gui */
scumm->_gui = &gui; scumm->_gui = &gui;

28
sound.cpp
View file

@ -408,19 +408,22 @@ void Scumm::setupSound()
IMuse *se = _imuse; IMuse *se = _imuse;
if (se) { if (se) {
se->setBase(res.address[rtSound]); se->setBase(res.address[rtSound]);
if (!_soundVolumePreset) { if (!scummcfg->get("music_volume", "scummvm"))
if (se->get_music_volume() == 0) _sound_volume_music = 60;
se->set_music_volume(60); else
se->set_master_volume(125); _sound_volume_music = atoi(scummcfg->get("music_volume", "scummvm"));
_sound_volume_music = se->get_music_volume(); if (!scummcfg->get("master_volume", "scummvm"))
//_sound_volume_master = (se->get_master_volume() / 127); _sound_volume_master = 125;
_sound_volume_master = se->get_master_volume(); else
_sound_volume_master = atoi(scummcfg->get("master_volume", "scummvm"));
if (!scummcfg->get("sfx_volume", "scummvm"))
_sound_volume_sfx = 100;
else
_sound_volume_sfx = atoi(scummcfg->get("sfx_volume", "scummvm"));
} se->set_master_volume(_sound_volume_master);
else { se->set_music_volume(_sound_volume_music);
se->set_music_volume(_sound_volume_music); _mixer->set_volume(_sound_volume_sfx);
se->set_master_volume(_sound_volume_master);
}
} }
_sfxFile = openSfxFile(); _sfxFile = openSfxFile();
} }
@ -431,6 +434,7 @@ void Scumm::pauseSounds(bool pause)
if (se) if (se)
se->pause(pause); se->pause(pause);
_soundsPaused = pause; _soundsPaused = pause;
_mixer->pause(pause);
} }
enum { enum {