[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.136,1.137

Max Horn fingolfin at users.sourceforge.net
Sat Nov 27 09:19:09 CET 2004


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

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

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- smush_player.cpp	8 Oct 2004 18:30:14 -0000	1.136
+++ smush_player.cpp	27 Nov 2004 15:58:08 -0000	1.137
@@ -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 @@
 	if (_compressedFile.isOpen()) {
 		int size = _compressedFile.size();
 		_compressedFileMode = true;
-		_vm->_mixer->playVorbis(&_compressedFileSoundHandle, &_compressedFile, size);
+		_vm->_mixer->playInputStream(&_compressedFileSoundHandle, makeVorbisStream(&_compressedFile, size), false);
 	}
 #endif
 }





More information about the Scummvm-git-logs mailing list