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 --- ext/xine/xineinput.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ext/xine/xineinput.c') diff --git a/ext/xine/xineinput.c b/ext/xine/xineinput.c index 6d160728..a44f8c16 100644 --- a/ext/xine/xineinput.c +++ b/ext/xine/xineinput.c @@ -110,6 +110,8 @@ gst_xine_input_dispose (GObject *object) g_free (xine->location); xine->location = NULL; + + GST_CALL_PARENT (G_OBJECT_CLASS, dispose, (object)); } static void @@ -273,7 +275,7 @@ gst_xine_input_subclass_init (gpointer g_class, gpointer class_data) g_free (details.description); /* FIXME: this is pretty hackish, anyone knows a better idea (xine doesn't) */ - if (strcmp (input->get_description (input), "CD") == 0) { + if (strcmp (input->get_identifier (input), "cdda") == 0) { gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&cdda_template)); } else { -- cgit v1.2.1