[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,2.107,2.108 imuse.h,1.50,1.51 imuse_internal.h,2.30,2.31 scummvm.cpp,2.448,2.449

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv13122/scumm

Modified Files:
	imuse.cpp imuse.h imuse_internal.h scummvm.cpp 
Log Message:
removed the kDefault*Volume constants

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.107
retrieving revision 2.108
diff -u -d -r2.107 -r2.108
--- imuse.cpp	12 Oct 2003 16:46:23 -0000	2.107
+++ imuse.cpp	15 Oct 2003 23:16:52 -0000	2.108
@@ -22,7 +22,6 @@
 
 #include "stdafx.h"
 
-#include "base/gameDetector.h"	// For kDefaultMasterVolume etc.
 #include "common/util.h"
 
 #include "scumm/imuse.h"
@@ -610,10 +609,6 @@
 	return 0;
 }
 
-int IMuseInternal::get_master_volume() {
-	return _master_volume;
-}
-
 int IMuseInternal::terminate1() {
 	_initialized = false;
 	stopAllSounds();
@@ -1150,8 +1145,6 @@
 
 	if (!_tempoFactor) _tempoFactor = 100;
 	_master_volume = 255;
-	if (_music_volume < 1)
-		_music_volume = kDefaultMusicVolume;
 
 	for (i = 0; i != 8; i++)
 		_channel_volume[i] = _channel_volume_eff[i] = _volchan_table[i] = 127;
@@ -1784,7 +1777,6 @@
 int IMuse::set_music_volume(uint vol) { in(); int ret = _target->set_music_volume(vol); out(); return ret; }
 int IMuse::get_music_volume() { in(); int ret = _target->get_music_volume(); out(); return ret; }
 void IMuse::setMasterVolume(int vol) { in(); _target->setMasterVolume(vol); out(); }
-int IMuse::get_master_volume() { in(); int ret = _target->get_master_volume(); out(); return ret; }
 void IMuse::startSound(int sound) { in(); _target->startSound(sound); out(); }
 void IMuse::stopSound(int sound) { in(); _target->stopSound(sound); out(); }
 void IMuse::stopAllSounds() { in(); _target->stopAllSounds(); out(); }

Index: imuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- imuse.h	5 Oct 2003 15:35:31 -0000	1.50
+++ imuse.h	15 Oct 2003 23:16:52 -0000	1.51
@@ -66,7 +66,6 @@
 	int set_music_volume(uint vol);
 	int get_music_volume();
 	void setMasterVolume(int vol);
-	int get_master_volume();
 	void startSound(int sound);
 	void stopSound(int sound);
 	void stopAllSounds();

Index: imuse_internal.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_internal.h,v
retrieving revision 2.30
retrieving revision 2.31
diff -u -d -r2.30 -r2.31
--- imuse_internal.h	5 Oct 2003 15:36:00 -0000	2.30
+++ imuse_internal.h	15 Oct 2003 23:16:52 -0000	2.31
@@ -456,7 +456,6 @@
 	int set_music_volume(uint vol);
 	int get_music_volume();
 	int setMasterVolume(uint vol);
-	int get_master_volume();
 	bool startSound(int sound);
 	int stopSound(int sound);
 	int stopAllSounds();

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.448
retrieving revision 2.449
diff -u -d -r2.448 -r2.449
--- scummvm.cpp	15 Oct 2003 02:38:23 -0000	2.448
+++ scummvm.cpp	15 Oct 2003 23:16:52 -0000	2.449
@@ -660,8 +660,8 @@
 		_silentDigitalImuse = true;
 		_noDigitalSamples = true;
 	}
-	_mixer->setVolume(kDefaultSFXVolume * kDefaultMasterVolume / 255);
-	_mixer->setMusicVolume(kDefaultMusicVolume);
+	_mixer->setVolume(_sound->_sound_volume_sfx * _sound->_sound_volume_master / 255);
+	_mixer->setMusicVolume(_sound->_sound_volume_music);
 
 	// Init iMuse
 	if (_features & GF_DIGI_IMUSE) {