summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--gst/nsf/nsf.h9
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e2edc440..dd8e46c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-10 Tim-Philipp Müller <tim at centricular dot net>
+
+ * gst/nsf/nsf.h:
+ Change prototype of process function here too to avoid
+ 'incompatible assignment' warnings.
+
2008-04-10 Sebastian Dröge <slomo@circular-chaos.org>
* tests/check/elements/souphttpsrc.c: (got_buffer),
diff --git a/gst/nsf/nsf.h b/gst/nsf/nsf.h
index d81bb6fc..ce830745 100644
--- a/gst/nsf/nsf.h
+++ b/gst/nsf/nsf.h
@@ -104,7 +104,7 @@ typedef struct nsf_s
apu_t *apu;
/* our main processing routine, calls all external mixing routines */
- void (*process)(void *buffer, int num_samples);
+ void (*process)(uint8 *buffer, int num_samples);
} nsf_t;
/* $$$ ben : Generic loader struct */
@@ -148,7 +148,12 @@ extern int nsf_setfilter(nsf_t *nsf, int filter_type);
/*
** $Log$
-** Revision 1.2 2008/03/25 15:56:12 slomo
+** Revision 1.3 2008/04/10 10:01:48 tpm
+** * gst/nsf/nsf.h:
+** Change prototype of process function here too to avoid
+** 'incompatible assignment' warnings.
+**
+** 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: