[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.121,1.122 dimuse_track.cpp,1.44,1.45

Max Horn fingolfin at users.sourceforge.net
Sun Mar 6 15:16:49 CET 2005


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

Modified Files:
	dimuse.cpp dimuse_track.cpp 
Log Message:
Fix for bug #1153648 (Compressed BUN files play incorrectly on BE systems)

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- dimuse.cpp	12 Feb 2005 15:00:16 -0000	1.121
+++ dimuse.cpp	6 Mar 2005 23:15:56 -0000	1.122
@@ -176,8 +176,11 @@
 			} else
 				error("IMuseDigital::saveOrLoad(): Can't handle %d bit samples", bits);
 
+#ifdef SCUMM_LITTLE_ENDIAN
+#error foo
 			if (track->compressed)
 				track->mixerFlags |= SoundMixer::FLAG_LITTLE_ENDIAN;
+#endif
 
 			int32 streamBufferSize = track->iteration;
 			track->stream2 = NULL;

Index: dimuse_track.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_track.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- dimuse_track.cpp	25 Jan 2005 22:21:26 -0000	1.44
+++ dimuse_track.cpp	6 Mar 2005 23:15:57 -0000	1.45
@@ -150,8 +150,10 @@
 		} else
 			error("IMuseDigital::startSound(): Can't handle %d bit samples", bits);
 
+#ifdef SCUMM_LITTLE_ENDIAN
 		if (track->compressed)
 			track->mixerFlags |= SoundMixer::FLAG_LITTLE_ENDIAN;
+#endif
 	}
 
 	if (input) {





More information about the Scummvm-git-logs mailing list