[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.20,1.21

Max Horn fingolfin at users.sourceforge.net
Fri May 3 17:11:01 CEST 2002


Update of /cvsroot/scummvm/scummvm/sound
In directory usw-pr-cvs1:/tmp/cvs-serv21695/sound

Modified Files:
	mixer.cpp 
Log Message:
my version of MAD (0.14.2b) has no MAD_ERROR_NONE; where did that come from?

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- mixer.cpp	3 May 2002 19:47:51 -0000	1.20
+++ mixer.cpp	4 May 2002 00:10:01 -0000	1.21
@@ -448,7 +448,7 @@
 					memcpy(_ptr, _stream.next_frame, not_decoded);
 					_size =	fread((unsigned char *)_ptr + not_decoded, 1, _buffer_size - not_decoded, _file);
 				}
-				_stream.error = MAD_ERROR_NONE;
+				_stream.error = (enum mad_error)0;
 				// Restream
 				mad_stream_buffer(&_stream, (unsigned char *)_ptr, _size + not_decoded);
 				if (mad_frame_decode(&_frame, &_stream) == -1) {





More information about the Scummvm-git-logs mailing list