[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src snd_stream.cpp,1.1,1.2
Chris Apers
chrilith at users.sourceforge.net
Sun Sep 12 05:54:09 CEST 2004
Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1028
Modified Files:
snd_stream.cpp
Log Message:
Removed obsolete code
Index: snd_stream.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/snd_stream.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- snd_stream.cpp 25 May 2004 14:23:17 -0000 1.1
+++ snd_stream.cpp 12 Sep 2004 12:53:47 -0000 1.2
@@ -1,30 +1,13 @@
-#ifndef COMPILE_STREAMSND
-# include "stdafx.h"
-# include "palm.h"
-#else
-# include "ARMNative.h"
-# include <endianutils.h>
-#endif
-
-#ifndef ByteSwap32
-#define ByteSwap32(x) x
-#else
-#define READ_LE_UINT32(x) *x
-#endif
+#include "stdafx.h"
+#include "palm.h"
Err sndCallback(void* UserDataP, SndStreamRef stream, void* bufferP, UInt32 *bufferSizeP) {
SoundDataType *snd = (SoundDataType *)UserDataP;
UInt32 size = *bufferSizeP;
-#ifdef COMPILE_STREAMSND
- // endian
- snd->set = ByteSwap32(snd->set);
- snd->size = ByteSwap32(snd->size);
-#endif
-
if (snd->set && snd->size) {
UInt32 *dst = (UInt32 *)bufferP;
- UInt32 *src = (UInt32 *)ByteSwap32(snd->dataP);
+ UInt32 *src = (UInt32 *)snd->dataP;
size = (snd->size / 16);
while (size--) {
@@ -37,14 +20,9 @@
} else {
snd->size = size;
- MemSet(bufferP, size, 0);
+ MemSet(bufferP, 128, 0);
+ *bufferSizeP = 128;
}
-#ifdef COMPILE_STREAMSND
- // endian
- snd->set = ByteSwap32(snd->set);
- snd->size = ByteSwap32(snd->size);
-#endif
-
return errNone;
}
\ No newline at end of file
More information about the Scummvm-git-logs
mailing list