diff options
Diffstat (limited to 'src/libxineadec')
| -rw-r--r-- | src/libxineadec/nosefart/diff_to_nosefart_cvs.patch | 31 | ||||
| -rw-r--r-- | src/libxineadec/nosefart/nes_apu.c | 17 |
2 files changed, 42 insertions, 6 deletions
diff --git a/src/libxineadec/nosefart/diff_to_nosefart_cvs.patch b/src/libxineadec/nosefart/diff_to_nosefart_cvs.patch index 9ae52bbce..280cd89cb 100644 --- a/src/libxineadec/nosefart/diff_to_nosefart_cvs.patch +++ b/src/libxineadec/nosefart/diff_to_nosefart_cvs.patch @@ -2,7 +2,7 @@ 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.1 2004/08/27 19:33:37 valtri Exp $ + ** $Id: diff_to_nosefart_cvs.patch,v 1.2 2005/05/07 09:11:39 valtri Exp $ */ -#ifndef _TYPES_H_ @@ -21,6 +21,10 @@ diff -u -p -r1.1.1.1 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. ** @@ -44,3 +48,28 @@ diff -u -p -r1.1.1.1 types.h ** - 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 */ diff --git a/src/libxineadec/nosefart/nes_apu.c b/src/libxineadec/nosefart/nes_apu.c index 525d103b1..4a2ed8f4d 100644 --- a/src/libxineadec/nosefart/nes_apu.c +++ b/src/libxineadec/nosefart/nes_apu.c @@ -20,7 +20,7 @@ ** nes_apu.c ** ** NES APU emulation -** $Id: nes_apu.c,v 1.3 2004/12/12 06:55:59 athp Exp $ +** $Id: nes_apu.c,v 1.4 2005/05/07 09:11:39 valtri Exp $ */ #include <string.h> @@ -1011,10 +1011,13 @@ void apu_process(void *buffer, int num_samples) 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 */ @@ -1154,6 +1157,10 @@ int32 apu_getcyclerate(void) /* ** $Log: nes_apu.c,v $ +** Revision 1.4 2005/05/07 09:11:39 valtri +** *BUGFIX* +** gcc4 patches from Dams Nadé (livna.org) and Keenan Pepper. +** ** Revision 1.3 2004/12/12 06:55:59 athp ** Code cleanups and elimination of some compiler warnings; patch courtesy of AL13N ** |