From d1032a28356cdd02e63338be78b334bdf2175e07 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 10 Sep 2009 11:53:09 +0200 Subject: [PATCH] whitespace fixes --- gst/gstelementfactory.c | 8 ++--- gst/gstelementfactory.h | 72 ++++++++++++++++++++--------------------- gst/gstpluginfeature.h | 36 ++++++++++----------- 3 files changed, 58 insertions(+), 58 deletions(-) diff --git a/gst/gstelementfactory.c b/gst/gstelementfactory.c index 9c7701ef01..4174fe4152 100644 --- a/gst/gstelementfactory.c +++ b/gst/gstelementfactory.c @@ -40,12 +40,12 @@ * Using an element factory * * #include <gst/gst.h> - * + * * GstElement *src; * GstElementFactory *srcfactory; - * + * * gst_init (&argc, &argv); - * + * * srcfactory = gst_element_factory_find ("filesrc"); * g_return_if_fail (srcfactory != NULL); * src = gst_element_factory_create (srcfactory, "src"); @@ -410,7 +410,7 @@ gst_element_factory_create (GstElementFactory * factory, const gchar * name) goto no_element; /* fill in the pointer to the factory in the element class. The - * class will not be unreffed currently. + * class will not be unreffed currently. * Be thread safe as there might be 2 threads creating the first instance of * an element at the same moment */ diff --git a/gst/gstelementfactory.h b/gst/gstelementfactory.h index bca9f88e26..178f2a6ca2 100644 --- a/gst/gstelementfactory.h +++ b/gst/gstelementfactory.h @@ -50,7 +50,7 @@ typedef struct _GstElementDetails GstElementDetails; * This struct defines the public information about a #GstElement. It contains * meta-data about the element that is mostly for the benefit of editors. * - * The @klass member can be used by applications to filter elements based + * The @klass member can be used by applications to filter elements based * on functionality. */ /* FIXME: need translatable stuff in here (how handle in registry)? @@ -80,7 +80,7 @@ struct _GstElementDetails * * Macro to initialize #GstElementDetails. */ -#define GST_ELEMENT_DETAILS(longname,klass,description,author) \ +#define GST_ELEMENT_DETAILS(longname,klass,description,author) \ { longname, klass, description, author, {NULL} } /** @@ -90,17 +90,17 @@ struct _GstElementDetails * Tests if element details are initialized. */ /* FIXME: what about adding '&& (*__gst_reserved==NULL)' */ -#define GST_IS_ELEMENT_DETAILS(details) ( \ - (details) && ((details)->longname != NULL) && ((details)->klass != NULL) \ +#define GST_IS_ELEMENT_DETAILS(details) ( \ + (details) && ((details)->longname != NULL) && ((details)->klass != NULL) \ && ((details)->description != NULL) && ((details)->author != NULL)) -#define GST_TYPE_ELEMENT_FACTORY (gst_element_factory_get_type()) -#define GST_ELEMENT_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ELEMENT_FACTORY,\ - GstElementFactory)) -#define GST_ELEMENT_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ELEMENT_FACTORY,\ - GstElementFactoryClass)) -#define GST_IS_ELEMENT_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ELEMENT_FACTORY)) -#define GST_IS_ELEMENT_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ELEMENT_FACTORY)) +#define GST_TYPE_ELEMENT_FACTORY (gst_element_factory_get_type()) +#define GST_ELEMENT_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ELEMENT_FACTORY,\ + GstElementFactory)) +#define GST_ELEMENT_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ELEMENT_FACTORY,\ + GstElementFactoryClass)) +#define GST_IS_ELEMENT_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ELEMENT_FACTORY)) +#define GST_IS_ELEMENT_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ELEMENT_FACTORY)) #define GST_ELEMENT_FACTORY_CAST(obj) ((GstElementFactory *)(obj)) /** @@ -109,20 +109,20 @@ struct _GstElementDetails * The opaque #GstElementFactory data structure. */ struct _GstElementFactory { - GstPluginFeature parent; + GstPluginFeature parent; - GType type; /* unique GType of element or 0 if not loaded */ + GType type; /* unique GType of element or 0 if not loaded */ - GstElementDetails details; + GstElementDetails details; - GList * staticpadtemplates; - guint numpadtemplates; + GList * staticpadtemplates; + guint numpadtemplates; /* URI interface stuff */ - guint uri_type; - gchar ** uri_protocols; + guint uri_type; + gchar ** uri_protocols; - GList * interfaces; /* interfaces this element implements */ + GList * interfaces; /* interfaces this element implements */ gpointer _gst_reserved[GST_PADDING]; }; @@ -133,33 +133,33 @@ struct _GstElementFactoryClass { gpointer _gst_reserved[GST_PADDING]; }; -GType gst_element_factory_get_type (void); +GType gst_element_factory_get_type (void); -GstElementFactory * gst_element_factory_find (const gchar *name); +GstElementFactory * gst_element_factory_find (const gchar *name); -GType gst_element_factory_get_element_type (GstElementFactory *factory); -G_CONST_RETURN gchar * gst_element_factory_get_longname (GstElementFactory *factory); -G_CONST_RETURN gchar * gst_element_factory_get_klass (GstElementFactory *factory); -G_CONST_RETURN gchar * gst_element_factory_get_description (GstElementFactory *factory); -G_CONST_RETURN gchar * gst_element_factory_get_author (GstElementFactory *factory); -guint gst_element_factory_get_num_pad_templates (GstElementFactory *factory); -G_CONST_RETURN GList * gst_element_factory_get_static_pad_templates (GstElementFactory *factory); -gint gst_element_factory_get_uri_type (GstElementFactory *factory); -gchar ** gst_element_factory_get_uri_protocols (GstElementFactory *factory); -gboolean gst_element_factory_has_interface (GstElementFactory *factory, +GType gst_element_factory_get_element_type (GstElementFactory *factory); +G_CONST_RETURN gchar * gst_element_factory_get_longname (GstElementFactory *factory); +G_CONST_RETURN gchar * gst_element_factory_get_klass (GstElementFactory *factory); +G_CONST_RETURN gchar * gst_element_factory_get_description (GstElementFactory *factory); +G_CONST_RETURN gchar * gst_element_factory_get_author (GstElementFactory *factory); +guint gst_element_factory_get_num_pad_templates (GstElementFactory *factory); +G_CONST_RETURN GList * gst_element_factory_get_static_pad_templates (GstElementFactory *factory); +gint gst_element_factory_get_uri_type (GstElementFactory *factory); +gchar ** gst_element_factory_get_uri_protocols (GstElementFactory *factory); +gboolean gst_element_factory_has_interface (GstElementFactory *factory, const gchar *interfacename); -GstElement* gst_element_factory_create (GstElementFactory *factory, - const gchar *name); -GstElement* gst_element_factory_make (const gchar *factoryname, const gchar *name); +GstElement* gst_element_factory_create (GstElementFactory *factory, + const gchar *name); +GstElement* gst_element_factory_make (const gchar *factoryname, const gchar *name); /* FIXME 0.11: move these two into our private headers */ void __gst_element_factory_add_static_pad_template (GstElementFactory *elementfactory, GstStaticPadTemplate *templ); void __gst_element_factory_add_interface (GstElementFactory *elementfactory, const gchar *interfacename); -gboolean gst_element_register (GstPlugin *plugin, const gchar *name, - guint rank, GType type); +gboolean gst_element_register (GstPlugin *plugin, const gchar *name, + guint rank, GType type); diff --git a/gst/gstpluginfeature.h b/gst/gstpluginfeature.h index f16b3c6744..a0a732dabb 100644 --- a/gst/gstpluginfeature.h +++ b/gst/gstpluginfeature.h @@ -29,13 +29,13 @@ G_BEGIN_DECLS -#define GST_TYPE_PLUGIN_FEATURE (gst_plugin_feature_get_type()) -#define GST_PLUGIN_FEATURE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PLUGIN_FEATURE, GstPluginFeature)) -#define GST_IS_PLUGIN_FEATURE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PLUGIN_FEATURE)) -#define GST_PLUGIN_FEATURE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_PLUGIN_FEATURE, GstPluginFeatureClass)) -#define GST_IS_PLUGIN_FEATURE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PLUGIN_FEATURE)) -#define GST_PLUGIN_FEATURE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_PLUGIN_FEATURE, GstPluginFeatureClass)) -#define GST_PLUGIN_FEATURE_CAST(obj) ((GstPluginFeature*)(obj)) +#define GST_TYPE_PLUGIN_FEATURE (gst_plugin_feature_get_type()) +#define GST_PLUGIN_FEATURE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PLUGIN_FEATURE, GstPluginFeature)) +#define GST_IS_PLUGIN_FEATURE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PLUGIN_FEATURE)) +#define GST_PLUGIN_FEATURE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_PLUGIN_FEATURE, GstPluginFeatureClass)) +#define GST_IS_PLUGIN_FEATURE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PLUGIN_FEATURE)) +#define GST_PLUGIN_FEATURE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_PLUGIN_FEATURE, GstPluginFeatureClass)) +#define GST_PLUGIN_FEATURE_CAST(obj) ((GstPluginFeature*)(obj)) /** * GST_PLUGIN_FEATURE_NAME: @@ -90,7 +90,7 @@ struct _GstPluginFeature { }; struct _GstPluginFeatureClass { - GstObjectClass parent_class; + GstObjectClass parent_class; /*< private >*/ gpointer _gst_reserved[GST_PADDING]; @@ -104,8 +104,8 @@ struct _GstPluginFeatureClass { * Structure used for filtering based on @name and @type. */ typedef struct { - const gchar *name; - GType type; + const gchar *name; + GType type; } GstTypeNameData; /** @@ -123,18 +123,18 @@ typedef gboolean (*GstPluginFeatureFilter) (GstPluginFeature *featu gpointer user_data); /* normal GObject stuff */ -GType gst_plugin_feature_get_type (void); +GType gst_plugin_feature_get_type (void); GstPluginFeature * - gst_plugin_feature_load (GstPluginFeature *feature); + gst_plugin_feature_load (GstPluginFeature *feature); -gboolean gst_plugin_feature_type_name_filter (GstPluginFeature *feature, - GstTypeNameData *data); +gboolean gst_plugin_feature_type_name_filter (GstPluginFeature *feature, + GstTypeNameData *data); -void gst_plugin_feature_set_rank (GstPluginFeature *feature, guint rank); -void gst_plugin_feature_set_name (GstPluginFeature *feature, const gchar *name); -guint gst_plugin_feature_get_rank (GstPluginFeature *feature); -G_CONST_RETURN gchar *gst_plugin_feature_get_name (GstPluginFeature *feature); +void gst_plugin_feature_set_rank (GstPluginFeature *feature, guint rank); +void gst_plugin_feature_set_name (GstPluginFeature *feature, const gchar *name); +guint gst_plugin_feature_get_rank (GstPluginFeature *feature); +G_CONST_RETURN gchar *gst_plugin_feature_get_name (GstPluginFeature *feature); void gst_plugin_feature_list_free (GList *list);