[Scummvm-cvs-logs] CVS: scummvm/simon sound.cpp,1.68,1.69

[Max Horn]

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

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/simon/sound.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- sound.cpp	31 Jul 2004 11:46:58 -0000	1.68
+++ sound.cpp	27 Nov 2004 15:58:16 -0000	1.69
@@ -18,10 +18,16 @@
  */
 
 #include "stdafx.h"
+
 #include "common/file.h"
 #include "common/util.h"
+
 #include "simon/sound.h"
+
+#include "sound/flac.h"
+#include "sound/mp3.h"
 #include "sound/voc.h"
+#include "sound/vorbis.h"
 
 namespace Simon {
 
@@ -213,7 +219,7 @@
 
 	uint32 size = _offsets[sound + i] - _offsets[sound];
 
-	_mixer->playMP3(handle, _file, size);
+	_mixer->playInputStream(handle, makeMP3Stream(_file, size), false);
 }
 #endif
 
@@ -237,7 +243,7 @@
 
 	uint32 size = _offsets[sound + i] - _offsets[sound];
 
-	_mixer->playVorbis(handle, _file, size);
+	_mixer->playInputStream(handle, makeVorbisStream(_file, size), false);
 }
 #endif
 
@@ -261,7 +267,7 @@
 
 	uint32 size = _offsets[sound + i] - _offsets[sound];
 
-	_mixer->playFlac(handle, _file, size);
+	_mixer->playInputStream(handle, makeFlacStream(_file, size), false);
 }
 #endif