From 62e5a673768b976b987243cd8f9dde1263cdca54 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 30 Dec 2011 16:26:47 +0000 Subject: [PATCH] audiocdsrc: remove some probing-related vfuncs GstPropertyProbe was removed, so these aren't actually used and we probably want something different for the new API. --- gst-libs/gst/audio/gstaudiocdsrc.c | 9 ++++++++- gst-libs/gst/audio/gstaudiocdsrc.h | 4 +++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gst-libs/gst/audio/gstaudiocdsrc.c b/gst-libs/gst/audio/gstaudiocdsrc.c index 213a2a4..981390b 100644 --- a/gst-libs/gst/audio/gstaudiocdsrc.c +++ b/gst-libs/gst/audio/gstaudiocdsrc.c @@ -410,7 +410,9 @@ static void gst_audio_cd_src_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec) { +#if 0 GstAudioCdSrcClass *klass = GST_AUDIO_CD_SRC_GET_CLASS (object); +#endif GstAudioCdSrc *src = GST_AUDIO_CD_SRC (object); GST_OBJECT_LOCK (src); @@ -420,6 +422,7 @@ gst_audio_cd_src_get_property (GObject * object, guint prop_id, g_value_set_enum (value, src->priv->mode); break; case ARG_DEVICE:{ +#if 0 if (src->priv->device == NULL && klass->get_default_device != NULL) { gchar *d = klass->get_default_device (src); @@ -429,6 +432,7 @@ gst_audio_cd_src_get_property (GObject * object, guint prop_id, break; } } +#endif if (src->priv->device == NULL) g_value_set_string (value, DEFAULT_DEVICE); else @@ -1464,9 +1468,12 @@ gst_audio_cd_src_start (GstBaseSrc * basesrc) if (src->priv->device != NULL) { device = g_strdup (src->priv->device); - } else if (klass->get_default_device != NULL) { + } +#if 0 + else if (klass->get_default_device != NULL) { device = klass->get_default_device (src); } +#endif if (device == NULL) device = g_strdup (DEFAULT_DEVICE); diff --git a/gst-libs/gst/audio/gstaudiocdsrc.h b/gst-libs/gst/audio/gstaudiocdsrc.h index 643da34..27aee92 100644 --- a/gst-libs/gst/audio/gstaudiocdsrc.h +++ b/gst-libs/gst/audio/gstaudiocdsrc.h @@ -109,15 +109,17 @@ struct _GstAudioCdSrcClass { /* read one sector (LBA) */ GstBuffer * (*read_sector) (GstAudioCdSrc *src, gint sector); +#if 0 /* return default device or NULL (optional) */ gchar * (*get_default_device) (GstAudioCdSrc *src); /* return NULL-terminated string array of CD devices, or NULL (optional) */ /* FIXME 0.11: reconsider for new probing/device discovery API, remove if in doubt */ gchar ** (*probe_devices) (GstAudioCdSrc *src); +#endif /*< private >*/ - gpointer _gst_reserved[GST_PADDING]; + gpointer _gst_reserved[GST_PADDING_LARGE]; }; GType gst_audio_cd_src_get_type (void); -- 2.7.4