2005-05-30 Wim Taymans <wim@fluendo.com>
+ * gst/Makefile.am:
+ * gst/gstelement.h:
+ * gst/gstelementfactory.h:
+ * gst/gsttypes.h:
+ Move elementfactory methods to separate .h file.
+
+2005-05-30 Wim Taymans <wim@fluendo.com>
+
* docs/design/part-overview.txt:
* gst/gstsystemclock.h:
Small typo fixes, doc updates.
gstclock.h \
gstcompat.h \
gstelement.h \
+ gstelementfactory.h \
gsterror.h \
gstevent.h \
gstfilter.h \
#include <gst/gstobject.h>
#include <gst/gstpad.h>
#include <gst/gstclock.h>
+#include <gst/gstelementfactory.h>
#include <gst/gstplugin.h>
#include <gst/gstpluginfeature.h>
#include <gst/gstindex.h>
G_BEGIN_DECLS
-typedef struct _GstElementDetails GstElementDetails;
-
-/* FIXME: need translatable stuff in here (how handle in registry)? */
-struct _GstElementDetails
-{
- /*< public > */
- gchar *longname; /* long, english name */
- gchar *klass; /* type of element, as hierarchy */
- gchar *description; /* insights of one form or another */
- gchar *author; /* who wrote this thing? */
-
- /*< private > */
- gpointer _gst_reserved[GST_PADDING];
-};
+GST_EXPORT GType _gst_element_type;
-#define GST_ELEMENT_DETAILS(longname,klass,description,author) \
- { longname, klass, description, author, GST_PADDING_INIT }
-#define GST_IS_ELEMENT_DETAILS(details) ( \
- (details) && ((details)->longname != NULL) && ((details)->klass != NULL) \
- && ((details)->description != NULL) && ((details)->author != NULL))
+#define GST_TYPE_ELEMENT (_gst_element_type)
+#define GST_IS_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_ELEMENT))
+#define GST_IS_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_ELEMENT))
+#define GST_ELEMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_ELEMENT, GstElementClass))
+#define GST_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_ELEMENT, GstElement))
+#define GST_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_ELEMENT, GstElementClass))
+#define GST_ELEMENT_CAST(obj) ((GstElement*)(obj))
#define GST_NUM_STATES 4
-
/* NOTE: this probably should be done with an #ifdef to decide
* whether to safe-cast or to just do the non-checking cast.
*/
#define GST_STATE_PAUSED_TO_READY ((GST_STATE_PAUSED<<8) | GST_STATE_READY)
#define GST_STATE_READY_TO_NULL ((GST_STATE_READY<<8) | GST_STATE_NULL)
-GST_EXPORT GType _gst_element_type;
-
-#define GST_TYPE_ELEMENT (_gst_element_type)
-#define GST_IS_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_ELEMENT))
-#define GST_IS_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_ELEMENT))
-#define GST_ELEMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_ELEMENT, GstElementClass))
-#define GST_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_ELEMENT, GstElement))
-#define GST_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_ELEMENT, GstElementClass))
-#define GST_ELEMENT_CAST(obj) ((GstElement*)(obj))
-
/* convenience functions */
#ifdef G_HAVE_ISO_VARARGS
#define GST_ELEMENT_QUERY_TYPE_FUNCTION(functionname, ...) \
#define GST_STATE_SIGNAL(elem) g_cond_signal (GST_STATE_GET_COND (elem));
#define GST_STATE_BROADCAST(elem) g_cond_broadcast (GST_STATE_GET_COND (elem));
-typedef struct _GstElementFactory GstElementFactory;
-typedef struct _GstElementFactoryClass GstElementFactoryClass;
-
struct _GstElement
{
GstObject object;
change. it is cleared when doing another state change. */
/*< public >*/ /* with LOCK */
/* element manager */
- GstPipeline *manager;
- GstBus *bus;
+ GstPipeline *manager;
+ GstBus *bus;
GstScheduler *scheduler;
- /* private pointer for the scheduler */
- gpointer sched_private;
/* allocated clock */
GstClock *clock;
/* factory management */
GstElementFactory* gst_element_get_factory (GstElement *element);
-/*
- *
- * factories stuff
- *
- **/
-
-#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))
-
-struct _GstElementFactory {
- GstPluginFeature parent;
-
- GType type; /* unique GType of element or 0 if not loaded */
-
- GstElementDetails details;
-
- GList * staticpadtemplates;
- guint numpadtemplates;
-
- /* URI interface stuff */
- guint uri_type;
- gchar ** uri_protocols;
-
- GList * interfaces; /* interfaces this element implements */
-
- gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstElementFactoryClass {
- GstPluginFeatureClass parent_class;
-
- gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_element_factory_get_type (void);
-
-gboolean gst_element_register (GstPlugin *plugin,
- const gchar *name,
- guint rank,
- GType type);
-
-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);
-guint gst_element_factory_get_uri_type (GstElementFactory *factory);
-gchar ** gst_element_factory_get_uri_protocols (GstElementFactory *factory);
-
-GstElement* gst_element_factory_create (GstElementFactory *factory,
- const gchar *name);
-GstElement* gst_element_factory_make (const gchar *factoryname, const gchar *name);
-
-void __gst_element_factory_add_static_pad_template (GstElementFactory *elementfactory,
- GstStaticPadTemplate *templ);
-void __gst_element_factory_add_interface (GstElementFactory *elementfactory,
- const gchar *interfacename);
-
G_END_DECLS
#endif /* __GST_ELEMENT_H__ */
--- /dev/null
+/* GStreamer
+ * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
+ * 2000,2004 Wim Taymans <wim@fluendo.com>
+ *
+ * gstelement.h: Header for GstElement
+ *
+ * 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_ELEMENT_FACTORY_H__
+#define __GST_ELEMENT_FACTORY_H__
+
+#include <gst/gstconfig.h>
+#include <gst/gsttypes.h>
+#include <gst/gstelement.h>
+#include <gst/gstobject.h>
+#include <gst/gstplugin.h>
+#include <gst/gstpluginfeature.h>
+#include <gst/gstiterator.h>
+
+G_BEGIN_DECLS
+
+/* FIXME: need translatable stuff in here (how handle in registry)? */
+struct _GstElementDetails
+{
+ /*< public > */
+ gchar *longname; /* long, english name */
+ gchar *klass; /* type of element, as hierarchy */
+ gchar *description; /* insights of one form or another */
+ gchar *author; /* who wrote this thing? */
+
+ /*< private > */
+ gpointer _gst_reserved[GST_PADDING];
+};
+
+#define GST_ELEMENT_DETAILS(longname,klass,description,author) \
+ { longname, klass, description, author, GST_PADDING_INIT }
+#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))
+
+struct _GstElementFactory {
+ GstPluginFeature parent;
+
+ GType type; /* unique GType of element or 0 if not loaded */
+
+ GstElementDetails details;
+
+ GList * staticpadtemplates;
+ guint numpadtemplates;
+
+ /* URI interface stuff */
+ guint uri_type;
+ gchar ** uri_protocols;
+
+ GList * interfaces; /* interfaces this element implements */
+
+ gpointer _gst_reserved[GST_PADDING];
+};
+
+struct _GstElementFactoryClass {
+ GstPluginFeatureClass parent_class;
+
+ gpointer _gst_reserved[GST_PADDING];
+};
+
+GType gst_element_factory_get_type (void);
+
+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);
+guint gst_element_factory_get_uri_type (GstElementFactory *factory);
+gchar ** gst_element_factory_get_uri_protocols (GstElementFactory *factory);
+
+GstElement* gst_element_factory_create (GstElementFactory *factory,
+ const gchar *name);
+GstElement* gst_element_factory_make (const gchar *factoryname, const gchar *name);
+
+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);
+
+
+
+G_END_DECLS
+
+#endif /* __GST_ELEMENT_FACTORY_H__ */
G_BEGIN_DECLS
+typedef struct _GstBin GstBin;
+typedef struct _GstBinClass GstBinClass;
+typedef struct _GstBus GstBus;
+typedef struct _GstBusClass GstBusClass;
+typedef struct _GstElement GstElement;
+typedef struct _GstElementClass GstElementClass;
+typedef struct _GstElementDetails GstElementDetails;
+typedef struct _GstElementFactory GstElementFactory;
+typedef struct _GstElementFactoryClass GstElementFactoryClass;
typedef struct _GstObject GstObject;
typedef struct _GstObjectClass GstObjectClass;
typedef struct _GstPad GstPad;
typedef struct _GstPadClass GstPadClass;
typedef struct _GstPadTemplate GstPadTemplate;
typedef struct _GstPadTemplateClass GstPadTemplateClass;
-typedef struct _GstElement GstElement;
-typedef struct _GstElementClass GstElementClass;
-typedef struct _GstBin GstBin;
-typedef struct _GstBinClass GstBinClass;
typedef struct _GstPipeline GstPipeline;
typedef struct _GstPipelineClass GstPipelineClass;
-typedef struct _GstBus GstBus;
-typedef struct _GstBusClass GstBusClass;
typedef struct _GstScheduler GstScheduler;
typedef struct _GstSchedulerClass GstSchedulerClass;
} GstElementStateReturn;
typedef enum {
- GST_RESULT_OK,
- GST_RESULT_NOK,
- GST_RESULT_NOT_IMPL
-} GstResult;
-
-typedef enum {
GST_RANK_NONE = 0,
GST_RANK_MARGINAL = 64,
GST_RANK_SECONDARY = 128,
projects / platform / upstream / gstreamer.git / commitdiff