1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
diff -u -p -r1.1.1.1 types.h
--- types.h 26 Jul 2004 15:27:59 -0000 1.1.1.1
+++ types.h 26 Aug 2004 16:00:07 -0000
@@ -23,8 +23,8 @@
** $Id: diff_to_nosefart_cvs.patch,v 1.2 2005/05/07 09:11:39 valtri Exp $
*/
-#ifndef _TYPES_H_
-#define _TYPES_H_
+#ifndef _NOSEFART_TYPES_H_
+#define _NOSEFART_TYPES_H_
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -88,7 +88,7 @@ typedef uint8 boolean;
#define ASSERT_MSG(msg)
#endif
-#endif /* _TYPES_H_ */
+#endif /* _NOSEFART_TYPES_H_ */
/*
** $Log: diff_to_nosefart_cvs.patch,v $
** Revision 1.2 2005/05/07 09:11:39 valtri
** *BUGFIX*
** gcc4 patches from Dams Nadé (livna.org) and Keenan Pepper.
**
** Revision 1.1 2004/08/27 19:33:37 valtri
** MINGW32 port. Engine library and most of plugins compiles now.
**
** List of some changes:
** - replaced some _MSC_VER by more common WIN32
** - define INTLDIR, remove -static flag for included intl
** - shared more common CFLAGS with DEBUG_CFLAGS
** - use WIN32_CFLAGS for all building
** - separate some flags into THREAD_CFLAGS_CONFIG,
** THREAD_CFLAGS_CONFIG and ZLIB_LIB_CONFIG for public xine-config,
** automatically use internal libs if necessary
** - don't warn about missing X for mingw and cygwin
** - libw32dll disabled for WIN32 (making native loader would be
** interesting, or porting wine code to Windows? :->)
** - DVB and RTP disabled for WIN32, not ported yet
** - fix build and fix a warning in cdda
** - fix build for nosefart and libfaad
** - implement configure option --disable-freetype
** - sync libxine.pc and xine-config.in
** - add -liberty to goom under WIN32
** - move original build files from included phread and zlib into archives
** and replace them by autotools
**
Index: nes_apu.c
===================================================================
RCS file: /home/valtri/CVS/xine-lib/src/libxineadec/nosefart/nes_apu.c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 nes_apu.c
--- nes_apu.c 12 Dec 2004 13:57:16 -0000 1.1.1.1
+++ nes_apu.c 7 May 2005 08:23:36 -0000
@@ -1011,10 +1011,13 @@ void apu_process(void *buffer, int num_s
accum = -0x8000;
/* signed 16-bit output, unsigned 8-bit */
- if (16 == apu->sample_bits)
- *((int16 *) buffer)++ = (int16) accum;
- else
- *((uint8 *) buffer)++ = (accum >> 8) ^ 0x80;
+ if (16 == apu->sample_bits) {
+ *((int16 *) buffer) = (int16) accum;
+ buffer = (int16 *) buffer + 1;
+ } else {
+ *((uint8 *) buffer) = (accum >> 8) ^ 0x80;
+ buffer = (int8 *) buffer + 1;
+ }
}
/* resync cycle counter */
|
