[Scummvm-cvs-logs] CVS: scummvm/queen sound.cpp,1.46,1.47

[Max Horn]

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

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

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- sound.cpp	23 Nov 2004 22:21:43 -0000	1.46
+++ sound.cpp	27 Nov 2004 15:58:07 -0000	1.47
@@ -27,6 +27,10 @@
 #include "queen/queen.h"
 #include "queen/resource.h"
 
+#include "sound/flac.h"
+#include "sound/mp3.h"
+#include "sound/vorbis.h"
+
 #define	SB_HEADER_SIZE	110
 #define	STOP_MUSIC	-1
 
@@ -190,7 +194,7 @@
 	if (_vm->resource()->fileExists(name)) {
 		uint32 size;
 		File *f = _vm->resource()->giveCompressedSound(name, &size);
-		_mixer->playMP3(isSpeech ? &_speechHandle : &_sfxHandle, f, size);
+		_mixer->playInputStream(isSpeech ? &_speechHandle : &_sfxHandle, makeMP3Stream(f, size), false);
 	}
 }
 #endif
@@ -200,7 +204,7 @@
 	if (_vm->resource()->fileExists(name)) {
 		uint32 size;
 		File *f = _vm->resource()->giveCompressedSound(name, &size);		
-		_mixer->playVorbis(isSpeech ? &_speechHandle : &_sfxHandle, f, size);
+		_mixer->playInputStream(isSpeech ? &_speechHandle : &_sfxHandle, makeVorbisStream(f, size), false);
 	}
 }
 #endif
@@ -210,7 +214,7 @@
 	if (_vm->resource()->fileExists(name)) {
 		uint32 size;
 		File *f = _vm->resource()->giveCompressedSound(name, &size);		
-		_mixer->playFlac(isSpeech ? &_speechHandle : &_sfxHandle, f, size);
+		_mixer->playInputStream(isSpeech ? &_speechHandle : &_sfxHandle, makeFlacStream(f, size), false);
 	}
 }
 #endif