formatter: Add a timeline protected field

diff --git a/ges/ges-formatter.c b/ges/ges-formatter.c
index 4c1f495b9881441626856abdb76544d8fa6012d7..c0c7f9b1542537bcdb14829380eaf6f10d562337 100644 (file)
--- a/ges/ges-formatter.c
+++ b/ges/ges-formatter.c
@@ -341,6 +341,7 @@ ges_formatter_load (GESFormatter * formatter, GESTimeline * timeline)
 {
   GESFormatterClass *klass;
 
+  formatter->timeline = timeline;
   klass = GES_FORMATTER_GET_CLASS (formatter);
 
   if (klass->load)
@@ -411,6 +412,7 @@ ges_formatter_load_from_uri (GESFormatter * formatter, GESTimeline * timeline,
       G_CALLBACK (discovery_error_cb), formatter);
   if (klass->load_from_uri) {
     ges_timeline_enable_update (timeline, FALSE);
+    formatter->timeline = timeline;
     ret = klass->load_from_uri (formatter, timeline, uri);
     ges_timeline_enable_update (timeline, TRUE);
   }

diff --git a/ges/ges-formatter.h b/ges/ges-formatter.h
index 2cc6dda18c679eab8c732a5796acbfa0d43891a1..bc2b7232f002ed4770279e80e4eb163d665823fd 100644 (file)
--- a/ges/ges-formatter.h
+++ b/ges/ges-formatter.h
@@ -55,8 +55,11 @@ struct _GESFormatter {
   /*< private >*/
   GESFormatterPrivate *priv;
 
+  /*< protected >*/
+  GESTimeline *timeline;
+
   /* Padding for API extension */
-  gpointer _ges_reserved[GES_PADDING];
+  gpointer _ges_reserved[GES_PADDING - 1];
 };
 
 typedef gboolean (*GESFormatterCanLoadURIMethod) (const gchar * uri);