[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,2.108,2.109 imuse.h,1.51,1.52 imuse_internal.h,2.31,2.32

[Jamieson Christian]

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

Modified Files:
	imuse.cpp imuse.h imuse_internal.h 
Log Message:
Added trace output for IMuse doCommand codes that we're not sure
are even used by the game scripts. This is in preparation for a
restructuring of the volume model.

Also removed unused get_music_volume() member.

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.108
retrieving revision 2.109
diff -u -d -r2.108 -r2.109
--- imuse.cpp	15 Oct 2003 23:16:52 -0000	2.108
+++ imuse.cpp	17 Oct 2003 16:46:06 -0000	2.109
@@ -575,10 +575,6 @@
 	}
 }
 
-int IMuseInternal::get_music_volume() {
-	return _music_volume;
-}
-
 int IMuseInternal::set_music_volume(uint vol) {
 	if (vol > 255)
 		vol = 255;
@@ -697,9 +693,12 @@
 		case 6:
 			if (a[1] > 127)
 				return -1;
-			else
+			else {
+				warning ("IMuse doCommand(6) - setMasterVolume (%d)", a[1]);
 				return setMasterVolume((a[1] << 1) |(a[1] ? 0 : 1)); // Convert from 0-127 to 0-255
+			}
 		case 7:
+			warning ("IMuse doCommand(7) - getMasterVolume (%d)", a[1]);
 			return _master_volume >> 1; // Convert from 0-255 to 0-127
 		case 8:
 			return startSound(a[1]) ? 0 : -1;
@@ -741,9 +740,11 @@
 			}
 			return -1;
 		case 16:
+			warning ("IMuse doCommand(16) - set_volchan (%d, %d)", a[1], a[2]);
 			return set_volchan(a[1], a[2]);
 		case 17:
 			if (g_scumm->_gameId != GID_SAMNMAX) {
+				warning ("IMuse doCommand(17) - set_channel_volume (%d, %d)", a[1], a[2]);
 				return set_channel_volume(a[1], a[2]);
 			} else {
 				if (a[4]) {
@@ -1775,7 +1776,6 @@
 void IMuse::pause(bool paused) { in(); _target->pause(paused); out(); }
 int IMuse::save_or_load(Serializer *ser, ScummEngine *scumm) { in(); int ret = _target->save_or_load(ser, scumm); out(); return ret; }
 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(); }
 void IMuse::startSound(int sound) { in(); _target->startSound(sound); out(); }
 void IMuse::stopSound(int sound) { in(); _target->stopSound(sound); out(); }

Index: imuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- imuse.h	15 Oct 2003 23:16:52 -0000	1.51
+++ imuse.h	17 Oct 2003 16:46:06 -0000	1.52
@@ -64,7 +64,6 @@
 	void pause(bool paused);
 	int save_or_load(Serializer *ser, ScummEngine *scumm);
 	int set_music_volume(uint vol);
-	int get_music_volume();
 	void setMasterVolume(int vol);
 	void startSound(int sound);
 	void stopSound(int sound);

Index: imuse_internal.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_internal.h,v
retrieving revision 2.31
retrieving revision 2.32
diff -u -d -r2.31 -r2.32
--- imuse_internal.h	15 Oct 2003 23:16:52 -0000	2.31
+++ imuse_internal.h	17 Oct 2003 16:46:06 -0000	2.32
@@ -454,7 +454,6 @@
 	int terminate2();
 	int save_or_load(Serializer *ser, ScummEngine *scumm);
 	int set_music_volume(uint vol);
-	int get_music_volume();
 	int setMasterVolume(uint vol);
 	bool startSound(int sound);
 	int stopSound(int sound);