[Scummvm-cvs-logs] CVS: scummvm main.cpp,1.12,1.13 sound.cpp,1.70,1.71

[Nicolas Bacca]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv25678

Modified Files:
	main.cpp sound.cpp 
Log Message:
Start of volume support + mixer pause

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/main.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** main.cpp	1 May 2002 17:16:45 -0000	1.12
--- main.cpp	1 May 2002 22:36:14 -0000	1.13
***************
*** 125,128 ****
--- 125,131 ----
  		Scumm *scumm = Scumm::createFromDetector(&detector, system);
  		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 */

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** sound.cpp	1 May 2002 17:16:46 -0000	1.70
--- sound.cpp	1 May 2002 22:36:15 -0000	1.71
***************
*** 409,425 ****
  	if (se) {
  		se->setBase(res.address[rtSound]);
! 		if (!_soundVolumePreset) {
! 			if (se->get_music_volume() == 0)
! 				se->set_music_volume(60);
! 			se->set_master_volume(125);
! 			_sound_volume_music = se->get_music_volume();
! 			//_sound_volume_master = (se->get_master_volume() / 127);
! 			_sound_volume_master = se->get_master_volume();
  
! 		}
! 		else {
! 			se->set_music_volume(_sound_volume_music);
! 			se->set_master_volume(_sound_volume_master);
! 		}
  	}
  	_sfxFile = openSfxFile();
--- 409,428 ----
  	if (se) {
  		se->setBase(res.address[rtSound]);
! 		if (!scummcfg->get("music_volume", "scummvm"))
! 			_sound_volume_music = 60;
! 		else
! 			_sound_volume_music = atoi(scummcfg->get("music_volume", "scummvm"));
! 		if (!scummcfg->get("master_volume", "scummvm"))
! 			_sound_volume_master = 125;
! 		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);
! 		se->set_music_volume(_sound_volume_music);
! 		_mixer->set_volume(_sound_volume_sfx);
  	}
  	_sfxFile = openSfxFile();
***************
*** 432,435 ****
--- 435,439 ----
  		se->pause(pause);
  	_soundsPaused = pause;
+ 	_mixer->pause(pause);	
  }