mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

filter: remove gst_filter_run() and deprecated filter func

Browse source 
If someone wants to resurrect this, please use a less
generic name space for it.
This commit is contained in:
Tim-Philipp Müller 2011-10-31 14:16:05 +00:00
parent cfff518cee
commit 221c9423d3
7 changed files with 1 additions and 208 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
docs/gst/gstreamer-sections.txt
View file

@ -943,15 +943,6 @@ gst_qos_type_get_type
gst_event_type_flags_get_type gst_event_type_flags_get_type
</SECTION> </SECTION>
<SECTION>
<FILE>gstfilter</FILE>
<TITLE>GstFilter</TITLE>
GstFilterFunc
gst_filter_run
</SECTION>
<SECTION> <SECTION>
<FILE>gstformat</FILE> <FILE>gstformat</FILE>
<TITLE>GstFormat</TITLE> <TITLE>GstFormat</TITLE>
@ -1984,11 +1975,9 @@ gst_plugin_flags_get_type
<FILE>gstpluginfeature</FILE> <FILE>gstpluginfeature</FILE>
<TITLE>GstPluginFeature</TITLE> <TITLE>GstPluginFeature</TITLE>
GstPluginFeature GstPluginFeature
GstTypeNameData
GstPluginFeatureFilter GstPluginFeatureFilter
GstRank GstRank
gst_plugin_feature_type_name_filter
gst_plugin_feature_set_rank gst_plugin_feature_set_rank
gst_plugin_feature_set_name gst_plugin_feature_set_name
gst_plugin_feature_get_rank gst_plugin_feature_get_rank

2
gst/Makefile.am
View file

@ -62,7 +62,6 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
gstelementfactory.c \ gstelementfactory.c \
gsterror.c \ gsterror.c \
gstevent.c \ gstevent.c \
gstfilter.c \
gstformat.c \ gstformat.c \
gstghostpad.c \ gstghostpad.c \
gstindex.c \ gstindex.c \
@ -156,7 +155,6 @@ gst_headers = \
gstelementfactory.h \ gstelementfactory.h \
gsterror.h \ gsterror.h \
gstevent.h \ gstevent.h \
gstfilter.h \
gstformat.h \ gstformat.h \
gstghostpad.h \ gstghostpad.h \
gstindex.h \ gstindex.h \

95
gst/gstfilter.c
View file

@ -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 */

48
gst/gstfilter.h
View file

@ -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_ */

30
gst/gstpluginfeature.c
View file

@ -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: * gst_plugin_feature_set_rank:
* @feature: feature to rank * @feature: feature to rank

19
gst/gstpluginfeature.h
View file

@ -110,20 +110,6 @@ struct _GstPluginFeatureClass {
gpointer _gst_reserved[GST_PADDING]; 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: * GstPluginFeatureFilter:
* @feature: the pluginfeature to check * @feature: the pluginfeature to check
@ -144,11 +130,6 @@ GType gst_plugin_feature_get_type (void);
GstPluginFeature * GstPluginFeature *
gst_plugin_feature_load (GstPluginFeature *feature); 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); void gst_plugin_feature_set_rank (GstPluginFeature *feature, guint rank);
guint gst_plugin_feature_get_rank (GstPluginFeature *feature); guint gst_plugin_feature_get_rank (GstPluginFeature *feature);

4
gst/gstregistry.c
View file

@ -128,7 +128,6 @@
#include "gsterror.h" #include "gsterror.h"
#include "gstregistry.h" #include "gstregistry.h"
#include "gstmarshal.h" #include "gstmarshal.h"
#include "gstfilter.h"
#include "gstpluginloader.h" #include "gstpluginloader.h"
@ -652,12 +651,12 @@ gst_registry_plugin_filter (GstRegistry * registry,
return list; return list;
} }
#ifdef GST_DISABLE_DEPRECATED
typedef struct typedef struct
{ {
const gchar *name; const gchar *name;
GType type; GType type;
} GstTypeNameData; } GstTypeNameData;
static gboolean static gboolean
gst_plugin_feature_type_name_filter (GstPluginFeature * feature, gst_plugin_feature_type_name_filter (GstPluginFeature * feature,
GstTypeNameData * data) GstTypeNameData * data)
@ -667,7 +666,6 @@ gst_plugin_feature_type_name_filter (GstPluginFeature * feature,
return ((data->type == 0 || data->type == G_OBJECT_TYPE (feature)) && return ((data->type == 0 || data->type == G_OBJECT_TYPE (feature)) &&
(data->name == NULL || !strcmp (data->name, GST_OBJECT_NAME (feature)))); (data->name == NULL || !strcmp (data->name, GST_OBJECT_NAME (feature))));
} }
#endif
/* returns TRUE if the list was changed /* returns TRUE if the list was changed
* *