diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| m--------- | common | 0 | ||||
| -rw-r--r-- | gst/nsf/nes_apu.c | 9 | ||||
| -rw-r--r-- | gst/nsf/nes_apu.h | 11 |
4 files changed, 21 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2008-04-09 Jan Schmidt <Jan.Schmidt@sun.com> + + * gst/nsf/nes_apu.c: (apu_process): + * gst/nsf/nes_apu.h: + Don't do void pointer arithmetic - it's a gcc extension. + 2008-04-06 Tim-Philipp Müller <tim at centricular dot net> * ext/jack/gstjackaudiosink.c: (gst_jack_audio_sink_class_init): diff --git a/common b/common -Subproject fda6da5f2b9b000f7e1df8ffb44a6185ffd9799 +Subproject d3ace35f57dd196a3e83a0a48f1350ca32db8e3 diff --git a/gst/nsf/nes_apu.c b/gst/nsf/nes_apu.c index 47e1d72b..6ba5026f 100644 --- a/gst/nsf/nes_apu.c +++ b/gst/nsf/nes_apu.c @@ -972,7 +972,7 @@ apu_getpcmdata (void **data, int *num_samples, int *sample_bits) void -apu_process (void *buffer, int num_samples) +apu_process (uint8 * buffer, int num_samples) { apudata_t *d; uint32 elapsed_cycles; @@ -1210,7 +1210,12 @@ apu_getcyclerate (void) /* ** $Log$ -** Revision 1.2 2008/03/25 15:56:12 slomo +** Revision 1.3 2008/04/09 13:43:50 thaytan +** * gst/nsf/nes_apu.c: (apu_process): +** * gst/nsf/nes_apu.h: +** Don't do void pointer arithmetic - it's a gcc extension. +** +** Revision 1.2 2008-03-25 15:56:12 slomo ** Patch by: Andreas Henriksson <andreas at fatal dot set> ** * gst/nsf/Makefile.am: ** * gst/nsf/dis6502.h: diff --git a/gst/nsf/nes_apu.h b/gst/nsf/nes_apu.h index 01302dfa..41cec012 100644 --- a/gst/nsf/nes_apu.h +++ b/gst/nsf/nes_apu.h @@ -258,7 +258,7 @@ typedef struct apu_s int sample_bits; int refresh_rate; - void (*process)(void *buffer, int num_samples); + void (*process)(uint8 *buffer, int num_samples); /* $$$ ben : last error string */ const char * errstr; @@ -277,7 +277,7 @@ extern apu_t *apu_create(int sample_rate, int refresh_rate, int sample_bits, boo extern void apu_destroy(apu_t *apu); extern int apu_setext(apu_t *apu, apuext_t *ext); extern int apu_setfilter(int filter_type); -extern void apu_process(void *buffer, int num_samples); +extern void apu_process(uint8 *buffer, int num_samples); extern void apu_reset(void); extern int apu_setchan(int chan, boolean enabled); extern int32 apu_getcyclerate(void); @@ -301,7 +301,12 @@ void apu_setcontext(apu_t *src_apu); /* ** $Log$ -** Revision 1.2 2008/03/25 15:56:12 slomo +** Revision 1.3 2008/04/09 13:43:51 thaytan +** * gst/nsf/nes_apu.c: (apu_process): +** * gst/nsf/nes_apu.h: +** Don't do void pointer arithmetic - it's a gcc extension. +** +** Revision 1.2 2008-03-25 15:56:12 slomo ** Patch by: Andreas Henriksson <andreas at fatal dot set> ** * gst/nsf/Makefile.am: ** * gst/nsf/dis6502.h: |