summaryrefslogtreecommitdiff
path: root/gst/gstobject.h
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2005-07-18 12:49:53 +0000
committerWim Taymans <wim.taymans@gmail.com>2005-07-18 12:49:53 +0000
commite1aeec6d775a777295669ccd0165bd477e476025 (patch)
treec1b63c41ddc86d057e4b2150cdb3474f1f2e887e /gst/gstobject.h
parentfba0bf771b53b87d6a54dcb707e4299b93a4ff3c (diff)
Removed plugable schedulers.
Original commit message from CVS: Removed plugable schedulers. Removed Scheduler/Manager from elements. Removed gsttypes.h, rearranged includes. Removed dependency pad<->element, element<>pipeline, and various others, fix includes. implement gst_pad_get_parent() with gst_object_get_parent() Make GstTask sefcontained. Fix _get_state() on GstBin, it did not return ASYNC with a 0 timeout. Fix endless loop in iterator_fold_with_resync.
Diffstat (limited to 'gst/gstobject.h')
-rw-r--r--gst/gstobject.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/gst/gstobject.h b/gst/gstobject.h
index f466a2918b..30eea792ee 100644
--- a/gst/gstobject.h
+++ b/gst/gstobject.h
@@ -26,9 +26,7 @@
#include <gst/gstconfig.h>
-#include <glib-object.h> /* note that this gets wrapped in __GST_OBJECT_H__ */
-
-#include <gst/gsttypes.h>
+#include <glib-object.h>
G_BEGIN_DECLS
@@ -81,6 +79,9 @@ typedef enum
#define GST_OBJECT_IS_DESTROYED(obj) (GST_FLAG_IS_SET (obj, GST_OBJECT_DESTROYED))
#define GST_OBJECT_IS_FLOATING(obj) (GST_FLAG_IS_SET (obj, GST_OBJECT_FLOATING))
+typedef struct _GstObject GstObject;
+typedef struct _GstObjectClass GstObjectClass;
+
struct _GstObject {
GObject object;