From 47c01dd0989e38939ee7aa7e19dfcbbefe93a228 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 23 Feb 2004 22:21:30 +0000 Subject: ext/xine/xineinput.c: call parent dispose. Original commit message from CVS: 2004-02-23 Benjamin Otte * ext/xine/xineinput.c: (gst_xine_input_dispose): (gst_xine_input_subclass_init): call parent dispose. change pad template for CD reader correctly * ext/xine/Makefile.am: * ext/xine/gstxine.h: * ext/xine/xine.c: (plugin_init): * ext/xine/xineaudiosink.c: wrap audio sinks, too * gst-libs/gst/resample/private.h: * gst-libs/gst/resample/resample.c: (gst_resample_init), (gst_resample_reinit), (gst_resample_scale), (gst_resample_nearest_s16), (gst_resample_bilinear_s16), (gst_resample_sinc_slow_s16), (gst_resample_sinc_s16), (gst_resample_sinc_ft_s16), (gst_resample_nearest_float), (gst_resample_bilinear_float), (gst_resample_sinc_slow_float), (gst_resample_sinc_float), (gst_resample_sinc_ft_float): * gst-libs/gst/resample/resample.h: * gst/audioscale/gstaudioscale.c: (gst_audioscale_method_get_type), (gst_audioscale_class_init), (gst_audioscale_link), (gst_audioscale_get_buffer), (gst_audioscale_init), (gst_audioscale_chain), (gst_audioscale_set_property), (gst_audioscale_get_property): * gst/audioscale/gstaudioscale.h: s/resample_*/gst_resample_*/i to not clobber namespaces --- gst-libs/gst/resample/resample.h | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'gst-libs/gst/resample/resample.h') diff --git a/gst-libs/gst/resample/resample.h b/gst-libs/gst/resample/resample.h index ac6c1547..1c4216b3 100644 --- a/gst-libs/gst/resample/resample.h +++ b/gst-libs/gst/resample/resample.h @@ -18,30 +18,30 @@ */ -#ifndef __RESAMPLE_H__ -#define __RESAMPLE_H__ +#ifndef __GST_RESAMPLE_H__ +#define __GST_RESAMPLE_H__ typedef enum { - RESAMPLE_NEAREST = 0, - RESAMPLE_BILINEAR, - RESAMPLE_SINC_SLOW, - RESAMPLE_SINC, -} resample_method; + GST_RESAMPLE_NEAREST = 0, + GST_RESAMPLE_BILINEAR, + GST_RESAMPLE_SINC_SLOW, + GST_RESAMPLE_SINC, +} gst_resample_method; typedef enum { - RESAMPLE_S16 = 0, - RESAMPLE_FLOAT -} resample_format; + GST_RESAMPLE_S16 = 0, + GST_RESAMPLE_FLOAT +} gst_resample_format; -typedef struct resample_s resample_t; +typedef struct gst_resample_s gst_resample_t; -struct resample_s { +struct gst_resample_s { /* parameters */ - resample_method method; + gst_resample_method method; int channels; int verbose; - resample_format format; + gst_resample_format format; int filter_length; @@ -81,16 +81,16 @@ struct resample_s { double acc[10]; /* methods */ - void (*scale)(resample_t *r); + void (*scale)(gst_resample_t *r); double ack; }; -void resample_init(resample_t *r); +void gst_resample_init(gst_resample_t *r); -void resample_reinit(resample_t *r); +void gst_resample_reinit(gst_resample_t *r); -void resample_scale(resample_t *r, void *i_buf, unsigned int size); +void gst_resample_scale(gst_resample_t *r, void *i_buf, unsigned int size); -#endif /* __RESAMPLE_H__ */ +#endif /* __GST_RESAMPLE_H__ */ -- cgit v1.2.1