Added some more mixer doxygen docs; cleaned up Mixer API a bit, removing some very specialised methods

svn-id: r15914

4 files changed, 6 insertions, 5 deletions

diff --git a/scumm/player_mod.cpp b/scumm/player_mod.cpp
index 4f917072f0..3102df1cd1 100644
--- a/scumm/player_mod.cpp
+++ b/scumm/player_mod.cpp
@@ -31,7 +31,7 @@ namespace Scumm {
 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 @@ void Player_MOD::premix_proc(void *param, int16 *buf, uint len) {
 	((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;
diff --git a/scumm/player_v2.cpp b/scumm/player_v2.cpp
index bf6bde1f4c..ea4032f41a 100644
--- a/scumm/player_v2.cpp
+++ b/scumm/player_v2.cpp
@@ -348,7 +348,7 @@ Player_V2::Player_V2(ScummEngine *scumm, bool pcjr) {
 	_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;
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp
index 4f63a152e3..47ffe6d35e 100644
--- a/scumm/script_v72he.cpp
+++ b/scumm/script_v72he.cpp
@@ -966,7 +966,7 @@ void ScummEngine_v72he::o72_setTimer() {
 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);
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index 2940cda6b9..5d6d764bf7 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -43,6 +43,7 @@
 #include "scumm/insane/insane.h"
 
 #include "sound/mixer.h"
+#include "sound/vorbis.h"
 
 #ifdef DUMP_SMUSH_FRAMES
 #include <png.h>
@@ -1162,7 +1163,7 @@ void SmushPlayer::tryOggFile(const char *filename) {
 	if (_compressedFile.isOpen()) {
 		int size = _compressedFile.size();
 		_compressedFileMode = true;
-		_vm->_mixer->playVorbis(&_compressedFileSoundHandle, &_compressedFile, size);
+		_vm->_mixer->playInputStream(&_compressedFileSoundHandle, makeVorbisStream(&_compressedFile, size), false);
 	}
 #endif
 }