From d19f34722313dea3d4e1d13e914d89236c83e2e0 Mon Sep 17 00:00:00 2001 From: Thiago Santos Date: Sat, 15 Aug 2015 08:18:59 -0300 Subject: [PATCH] Revert "audiodecoder: expose default query handling function" Apparently I forgot how gobject works, there is no need to expose it directly as one can call it from the parent_class pointer This reverts commit 8a64592481dab985ca520a5b1cb394a609275c60. --- gst-libs/gst/audio/gstaudiodecoder.c | 16 +++------------- gst-libs/gst/audio/gstaudiodecoder.h | 3 --- win32/common/libgstaudio.def | 1 - 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/gst-libs/gst/audio/gstaudiodecoder.c b/gst-libs/gst/audio/gstaudiodecoder.c index 4515d2e33e..e0af954882 100644 --- a/gst-libs/gst/audio/gstaudiodecoder.c +++ b/gst-libs/gst/audio/gstaudiodecoder.c @@ -386,6 +386,8 @@ static gboolean gst_audio_decoder_negotiate_default (GstAudioDecoder * dec); static gboolean gst_audio_decoder_negotiate_unlocked (GstAudioDecoder * dec); static gboolean gst_audio_decoder_handle_gap (GstAudioDecoder * dec, GstEvent * event); +static gboolean gst_audio_decoder_sink_query_default (GstAudioDecoder * dec, + GstQuery * query); static gboolean gst_audio_decoder_src_query_default (GstAudioDecoder * dec, GstQuery * query); @@ -2635,19 +2637,7 @@ gst_audio_decoder_sink_getcaps (GstAudioDecoder * decoder, GstCaps * filter) return caps; } -/** - * gst_audio_decoder_sink_query_default: - * @decoder: a #GstAudioDecoder - * @query: (transfer none): a #GstQuery - * - * Calls the default query handler for #GstAudioDecoder. It is useful - * when a subclass only want to handle a particular type of query and - * wants to use the default handler for others. - * - * Returns: a boolean, representing if the query was handled. - * Since: 1.6 - */ -gboolean +static gboolean gst_audio_decoder_sink_query_default (GstAudioDecoder * dec, GstQuery * query) { GstPad *pad = GST_AUDIO_DECODER_SINK_PAD (dec); diff --git a/gst-libs/gst/audio/gstaudiodecoder.h b/gst-libs/gst/audio/gstaudiodecoder.h index cd65b2dbc1..1c498eeaeb 100644 --- a/gst-libs/gst/audio/gstaudiodecoder.h +++ b/gst-libs/gst/audio/gstaudiodecoder.h @@ -394,9 +394,6 @@ void gst_audio_decoder_get_allocator (GstAudioDecoder * dec, void gst_audio_decoder_merge_tags (GstAudioDecoder * dec, const GstTagList * tags, GstTagMergeMode mode); -gboolean gst_audio_decoder_sink_query_default (GstAudioDecoder * dec, - GstQuery * query); - void gst_audio_decoder_set_use_default_pad_acceptcaps (GstAudioDecoder * decoder, gboolean use); diff --git a/win32/common/libgstaudio.def b/win32/common/libgstaudio.def index 8ef663ea4d..93031a0090 100644 --- a/win32/common/libgstaudio.def +++ b/win32/common/libgstaudio.def @@ -68,7 +68,6 @@ EXPORTS gst_audio_decoder_set_plc_aware gst_audio_decoder_set_tolerance gst_audio_decoder_set_use_default_pad_acceptcaps - gst_audio_decoder_sink_query_default gst_audio_downmix_meta_api_get_type gst_audio_downmix_meta_get_info gst_audio_encoder_allocate_output_buffer