mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-29 15:22:17 +00:00
filter: remove gst_filter_run() and deprecated filter func
If someone wants to resurrect this, please use a less generic name space for it.
This commit is contained in:
Tim-Philipp Müller
parent
cfff518cee
commit
221c9423d3
7 changed files with 1 additions and 208 deletions
|
|
@ -943,15 +943,6 @@ gst_qos_type_get_type
|
|||
gst_event_type_flags_get_type
|
||||
</SECTION>
|
||||
|
||||
|
||||
<SECTION>
|
||||
<FILE>gstfilter</FILE>
|
||||
<TITLE>GstFilter</TITLE>
|
||||
GstFilterFunc
|
||||
gst_filter_run
|
||||
</SECTION>
|
||||
|
||||
|
||||
<SECTION>
|
||||
<FILE>gstformat</FILE>
|
||||
<TITLE>GstFormat</TITLE>
|
||||
|
|
@ -1984,11 +1975,9 @@ gst_plugin_flags_get_type
|
|||
<FILE>gstpluginfeature</FILE>
|
||||
<TITLE>GstPluginFeature</TITLE>
|
||||
GstPluginFeature
|
||||
GstTypeNameData
|
||||
GstPluginFeatureFilter
|
||||
GstRank
|
||||
|
||||
gst_plugin_feature_type_name_filter
|
||||
gst_plugin_feature_set_rank
|
||||
gst_plugin_feature_set_name
|
||||
gst_plugin_feature_get_rank
|
||||
|
|
|
|||
|
|
@ -62,7 +62,6 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
|
|||
gstelementfactory.c \
|
||||
gsterror.c \
|
||||
gstevent.c \
|
||||
gstfilter.c \
|
||||
gstformat.c \
|
||||
gstghostpad.c \
|
||||
gstindex.c \
|
||||
|
|
@ -156,7 +155,6 @@ gst_headers = \
|
|||
gstelementfactory.h \
|
||||
gsterror.h \
|
||||
gstevent.h \
|
||||
gstfilter.h \
|
||||
gstformat.h \
|
||||
gstghostpad.h \
|
||||
gstindex.h \
|
||||
|
|
|
|||
|
|
@ -1,95 +0,0 @@
|
|||
/* GStreamer
|
||||
* Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Library General Public
|
||||
* License along with this library; if not, write to the
|
||||
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/**
|
||||
* SECTION:gstfilter
|
||||
* @short_description: A utility function to filter GLists.
|
||||
*
|
||||
* <example>
|
||||
* <title>Filtering a list</title>
|
||||
* <programlisting>
|
||||
* GList *node;
|
||||
* GstObject *result = NULL;
|
||||
*
|
||||
* node = gst_filter_run (list, (GstFilterFunc) my_filter, TRUE, NULL);
|
||||
* if (node) {
|
||||
* result = GST_OBJECT (node->data);
|
||||
* gst_object_ref (result);
|
||||
* g_list_free (node);
|
||||
* }
|
||||
* </programlisting>
|
||||
* </example>
|
||||
*/
|
||||
#include "gst_private.h"
|
||||
#include <gst/gstfilter.h>
|
||||
|
||||
/**
|
||||
* gst_filter_run:
|
||||
* @list: a linked list
|
||||
* @func: (scope call): the function to execute for each item
|
||||
* @first: flag to stop execution after a successful item
|
||||
* @user_data: (closure): user data
|
||||
*
|
||||
* Iterates over the elements in @list, calling @func with the
|
||||
* list item data for each item. If @func returns TRUE, @data is
|
||||
* prepended to the list of results returned. If @first is true,
|
||||
* the search is halted after the first result is found.
|
||||
*
|
||||
* Since gst_filter_run() knows nothing about the type of @data, no
|
||||
* reference will be taken (if @data refers to an object) and no copy of
|
||||
* @data wil be made in any other way when prepending @data to the list of
|
||||
* results.
|
||||
*
|
||||
* Returns: (transfer container): the list of results. Free with g_list_free()
|
||||
* when no longer needed (the data contained in the list is a flat copy
|
||||
* and does need to be unreferenced or freed).
|
||||
*/
|
||||
#ifndef GST_REMOVE_DEPRECATED
|
||||
#ifdef GST_DISABLE_DEPRECATED
|
||||
typedef gboolean (*GstFilterFunc) (gpointer obj, gpointer user_data);
|
||||
GList *gst_filter_run (const GList * list, GstFilterFunc func, gboolean first,
|
||||
gpointer user_data);
|
||||
#endif
|
||||
GList *
|
||||
gst_filter_run (const GList * list, GstFilterFunc func, gboolean first,
|
||||
gpointer user_data)
|
||||
{
|
||||
const GList *walk = list;
|
||||
GList *result = NULL;
|
||||
|
||||
while (walk) {
|
||||
gboolean res = TRUE;
|
||||
gpointer data = walk->data;
|
||||
|
||||
walk = g_list_next (walk);
|
||||
|
||||
if (func)
|
||||
res = func (data, user_data);
|
||||
|
||||
if (res) {
|
||||
result = g_list_prepend (result, data);
|
||||
|
||||
if (first)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
#endif /* GST_REMOVE_DEPRECATED */
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
/* GStreamer
|
||||
* Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Library General Public
|
||||
* License along with this library; if not, write to the
|
||||
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifndef __GST_FILTER_H__
|
||||
#define __GST_FILTER_H__
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
/**
|
||||
* GstFilterFunc:
|
||||
* @obj: the object
|
||||
* @user_data: filter data
|
||||
*
|
||||
* Function prototype for a filter callback that can be use in gst_filter_run().
|
||||
* The function should apply its filtering to @obj. Additional data passed to
|
||||
* gst_filter_run() are in @data.
|
||||
*
|
||||
* Returns: %TRUE for success.
|
||||
*/
|
||||
#ifndef GST_DISABLE_DEPRECATED
|
||||
typedef gboolean (*GstFilterFunc) (gpointer obj, gpointer user_data);
|
||||
#endif
|
||||
|
||||
#ifndef GST_DISABLE_DEPRECATED
|
||||
GList* gst_filter_run (const GList *list, GstFilterFunc func, gboolean first, gpointer user_data);
|
||||
#endif
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __GST_FILTER_H_ */
|
||||
|
|
@ -147,36 +147,6 @@ not_found:
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_plugin_feature_type_name_filter:
|
||||
* @feature: the #GstPluginFeature
|
||||
* @data: (in): the type and name to check against
|
||||
*
|
||||
* Compares type and name of plugin feature. Can be used with gst_filter_run().
|
||||
*
|
||||
* Returns: TRUE if equal.
|
||||
*/
|
||||
#ifndef GST_REMOVE_DEPRECATED
|
||||
#ifdef GST_DISABLE_DEPRECATED
|
||||
typedef struct
|
||||
{
|
||||
const gchar *name;
|
||||
GType type;
|
||||
} GstTypeNameData;
|
||||
gboolean gst_plugin_feature_type_name_filter (GstPluginFeature * feature,
|
||||
GstTypeNameData * data);
|
||||
#endif
|
||||
gboolean
|
||||
gst_plugin_feature_type_name_filter (GstPluginFeature * feature,
|
||||
GstTypeNameData * data)
|
||||
{
|
||||
g_return_val_if_fail (GST_IS_PLUGIN_FEATURE (feature), FALSE);
|
||||
|
||||
return ((data->type == 0 || data->type == G_OBJECT_TYPE (feature)) &&
|
||||
(data->name == NULL || !strcmp (data->name, GST_OBJECT_NAME (feature))));
|
||||
}
|
||||
#endif /* GST_REMOVE_DEPRECATED */
|
||||
|
||||
/**
|
||||
* gst_plugin_feature_set_rank:
|
||||
* @feature: feature to rank
|
||||
|
|
|
|||
|
|
@ -110,20 +110,6 @@ struct _GstPluginFeatureClass {
|
|||
gpointer _gst_reserved[GST_PADDING];
|
||||
};
|
||||
|
||||
/**
|
||||
* GstTypeNameData:
|
||||
* @name: a name
|
||||
* @type: a GType
|
||||
*
|
||||
* Structure used for filtering based on @name and @type.
|
||||
*/
|
||||
#ifndef GST_DISABLE_DEPRECATED
|
||||
typedef struct {
|
||||
const gchar *name;
|
||||
GType type;
|
||||
} GstTypeNameData;
|
||||
#endif
|
||||
|
||||
/**
|
||||
* GstPluginFeatureFilter:
|
||||
* @feature: the pluginfeature to check
|
||||
|
|
@ -144,11 +130,6 @@ GType gst_plugin_feature_get_type (void);
|
|||
GstPluginFeature *
|
||||
gst_plugin_feature_load (GstPluginFeature *feature);
|
||||
|
||||
#ifndef GST_DISABLE_DEPRECATED
|
||||
gboolean gst_plugin_feature_type_name_filter (GstPluginFeature *feature,
|
||||
GstTypeNameData *data);
|
||||
#endif
|
||||
|
||||
void gst_plugin_feature_set_rank (GstPluginFeature *feature, guint rank);
|
||||
guint gst_plugin_feature_get_rank (GstPluginFeature *feature);
|
||||
|
||||
|
|
|
|||
|
|
@ -128,7 +128,6 @@
|
|||
#include "gsterror.h"
|
||||
#include "gstregistry.h"
|
||||
#include "gstmarshal.h"
|
||||
#include "gstfilter.h"
|
||||
|
||||
#include "gstpluginloader.h"
|
||||
|
||||
|
|
@ -652,12 +651,12 @@ gst_registry_plugin_filter (GstRegistry * registry,
|
|||
return list;
|
||||
}
|
||||
|
||||
#ifdef GST_DISABLE_DEPRECATED
|
||||
typedef struct
|
||||
{
|
||||
const gchar *name;
|
||||
GType type;
|
||||
} GstTypeNameData;
|
||||
|
||||
static gboolean
|
||||
gst_plugin_feature_type_name_filter (GstPluginFeature * feature,
|
||||
GstTypeNameData * data)
|
||||
|
|
@ -667,7 +666,6 @@ gst_plugin_feature_type_name_filter (GstPluginFeature * feature,
|
|||
return ((data->type == 0 || data->type == G_OBJECT_TYPE (feature)) &&
|
||||
(data->name == NULL || !strcmp (data->name, GST_OBJECT_NAME (feature))));
|
||||
}
|
||||
#endif
|
||||
|
||||
/* returns TRUE if the list was changed
|
||||
*
|
||||
|
|
|
|||
Loading…
Reference in a new issue