[Scummvm-cvs-logs] CVS: scummvm/scumm player_mod.cpp,2.16,2.17 player_v2.cpp,2.50,2.51 script_v72he.cpp,2.189,2.190

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26937/scumm

Modified Files:
	player_mod.cpp player_v2.cpp script_v72he.cpp 
Log Message:
Added some more mixer doxygen docs; cleaned up Mixer API a bit, removing some very specialised methods

Index: player_mod.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_mod.cpp,v
retrieving revision 2.16
retrieving revision 2.17
diff -u -d -r2.16 -r2.17
--- player_mod.cpp	11 Oct 2004 22:27:26 -0000	2.16
+++ player_mod.cpp	27 Nov 2004 15:58:07 -0000	2.17
@@ -31,7 +31,7 @@
 Player_MOD::Player_MOD(ScummEngine *scumm) {
 	int i;
 	_mixer = scumm->_mixer;
-	_samplerate = scumm->_system->getOutputSampleRate();
+	_samplerate = _mixer->getOutputRate();
 	_mixamt = 0;
 	_mixpos = 0;
 
@@ -150,7 +150,7 @@
 	((Player_MOD *) param)->do_mix(buf, len);
 }
 
-void Player_MOD::do_mix (int16 *data, uint len) {
+void Player_MOD::do_mix(int16 *data, uint len) {
 	int i;
 	int dpos = 0;
 	uint dlen = 0;

Index: player_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2.cpp,v
retrieving revision 2.50
retrieving revision 2.51
diff -u -d -r2.50 -r2.51
--- player_v2.cpp	11 Oct 2004 22:27:26 -0000	2.50
+++ player_v2.cpp	27 Nov 2004 15:58:07 -0000	2.51
@@ -348,7 +348,7 @@
 	_vm = scumm;
 	_system = scumm->_system;
 	_mixer = scumm->_mixer;
-	_sample_rate = _system->getOutputSampleRate();
+	_sample_rate = _mixer->getOutputRate();
 	_mutex = _system->createMutex();
 
 	_header_len = (scumm->_features & GF_OLD_BUNDLE) ? 4 : 6;

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.189
retrieving revision 2.190
diff -u -d -r2.189 -r2.190
--- script_v72he.cpp	27 Nov 2004 03:07:20 -0000	2.189
+++ script_v72he.cpp	27 Nov 2004 15:58:08 -0000	2.190
@@ -966,7 +966,7 @@
 void ScummEngine_v72he::o72_unknown5A() {
 	// Seems to get length of sound already played
 	int snd = pop();
-	int r = _mixer->getChannelElapsedTime(_sound->_musicChannelHandle);
+	int r = _mixer->getSoundElapsedTime(_sound->_musicChannelHandle);
 
 	push(r * 10);
 	debug(1,"o72_unknown5A stub (%d)", snd);