Merge branch 'master' into 0.11

[platform/upstream/gstreamer.git] / gst / gsttask.h

diff --git a/gst/gsttask.h b/gst/gsttask.h
index 279d530..1417525 100644 (file)
--- a/gst/gsttask.h
+++ b/gst/gsttask.h
@@ -99,7 +99,7 @@ typedef enum {
  *
  * Send a broadcast signal to all waiting task conds
  */
-#define GST_TASK_BROADCAST(task)        g_cond_breadcast(GST_TASK_GET_COND (task))
+#define GST_TASK_BROADCAST(task)        g_cond_broadcast(GST_TASK_GET_COND (task))
 
 /**
  * GST_TASK_GET_LOCK:
@@ -154,15 +154,11 @@ struct _GstTask {
   gboolean         running;
 
   /*< private >*/
-  union {
-    struct {
-      /* thread this task is currently running in */
-      GThread  *thread;
-    } ABI;
-    gpointer _gst_reserved[GST_PADDING - 1];
-  } abidata;
-
-  GstTaskPrivate *priv;
+  GThread         *thread;
+
+  GstTaskPrivate  *priv;
+
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstTaskClass {
@@ -179,7 +175,7 @@ void            gst_task_cleanup_all    (void);
 
 GType           gst_task_get_type       (void);
 
-GstTask*        gst_task_create         (GstTaskFunction func, gpointer data);
+GstTask*        gst_task_new            (GstTaskFunction func, gpointer data);
 void            gst_task_set_lock       (GstTask *task, GStaticRecMutex *mutex);
 void            gst_task_set_priority   (GstTask *task, GThreadPriority priority);