ges: Implement our own idle_add which uses the thread local maincontext

diff --git a/ges/ges-base-xml-formatter.c b/ges/ges-base-xml-formatter.c
index 7e5e1268d89365fcdf6ca989aa18dd3760df3ad8..971cd772373374ac217f003d976cd0971e276b63 100644 (file)
--- a/ges/ges-base-xml-formatter.c
+++ b/ges/ges-base-xml-formatter.c
@@ -283,7 +283,7 @@ _load_from_uri (GESFormatter * self, GESTimeline * timeline, const gchar * uri,
     return FALSE;
 
   if (priv->pending_assets == NULL)
-    g_idle_add ((GSourceFunc) _loading_done_cb, g_object_ref (self));
+    ges_idle_add ((GSourceFunc) _loading_done_cb, g_object_ref (self), NULL);
 
   return TRUE;
 }

diff --git a/ges/ges-internal.h b/ges/ges-internal.h
index a0c3e65e59328a4945e26c05f8e79a62ea9c908f..9b3d260a873fed5ca04a5aa90951f574f25f9c98 100644 (file)
--- a/ges/ges-internal.h
+++ b/ges/ges-internal.h
@@ -351,6 +351,9 @@ G_GNUC_INTERNAL gint element_end_compare                  (GESTimelineElement *
 G_GNUC_INTERNAL GstElementFactory *
 ges_get_compositor_factory                                (void);
 
+G_GNUC_INTERNAL void
+ges_idle_add (GSourceFunc func, gpointer udata, GDestroyNotify notify);
+
 
 /****************************************************
  *              GESContainer                        *

diff --git a/ges/ges-project.c b/ges/ges-project.c
index 8ff82a21d933b79d55a72a05294acd5b9f94e478..b0fd37916c1abf1634cdcb059e775588551760e5 100644 (file)
--- a/ges/ges-project.c
+++ b/ges/ges-project.c
@@ -224,7 +224,7 @@ _load_project (GESProject * project, GESTimeline * timeline, GError ** error)
       data->project = gst_object_ref (project);
 
       /* Make sure the signal is emitted after the functions ends */
-      g_idle_add ((GSourceFunc) _emit_loaded_in_idle, data);
+      ges_idle_add ((GSourceFunc) _emit_loaded_in_idle, data, NULL);
       return TRUE;
     }
   }

diff --git a/ges/ges-timeline-element.c b/ges/ges-timeline-element.c
index 36cf2fe14ec00c6f4d0a8840053ac0d1642397c6..ffa00f35d965cf2ad137efdfb0714503bfdfa4d4 100644 (file)
--- a/ges/ges-timeline-element.c
+++ b/ges/ges-timeline-element.c
@@ -1417,7 +1417,7 @@ child_prop_changed_cb (GObject * child, GParamSpec * arg
   data->arg = g_param_spec_ref (arg);
   data->self = gst_object_ref (self);
 
-  g_idle_add ((GSourceFunc) emit_deep_notify_in_idle, data);
+  ges_idle_add ((GSourceFunc) emit_deep_notify_in_idle, data, NULL);
 }
 
 gboolean

diff --git a/ges/ges-utils.c b/ges/ges-utils.c
index adb0d0ca0433e67f031f9b07e9e55159d5d2ba83..654039b850b38394c5eb9acd4648835d174c4a2a 100644 (file)
--- a/ges/ges-utils.c
+++ b/ges/ges-utils.c
@@ -166,6 +166,19 @@ ges_get_compositor_factory (void)
   return compositor_factory;
 }
 
+void
+ges_idle_add (GSourceFunc func, gpointer udata, GDestroyNotify notify)
+{
+  GMainContext *context = g_main_context_get_thread_default ();
+  GSource *source = g_idle_source_new ();
+  if (!context)
+    context = g_main_context_default ();
+
+  g_source_set_callback (source, func, udata, notify);
+  g_source_attach (source, context);
+
+}
+
 gboolean
 ges_nle_composition_add_object (GstElement * comp, GstElement * object)
 {