ges: Add a maxduration property to TrackFileSource

API: GESTrackFileSource::maxduration property

diff --git a/ges/ges-timeline-file-source.c b/ges/ges-timeline-file-source.c
index 185e358369ce3c1aaaf3d34ad03ad833fc9f0284..b706d32a704bcf0af9a347b1af5e2786e986557c 100644 (file)
--- a/ges/ges-timeline-file-source.c
+++ b/ges/ges-timeline-file-source.c
@@ -233,6 +233,7 @@ ges_timeline_filesource_set_max_duration (GESTimelineFileSource * self,
     guint64 maxduration)
 {
   GESTimelineObject *object = GES_TIMELINE_OBJECT (self);
+  GList *tmp, *tckobjs;
 
   self->priv->maxduration = maxduration;
   if (object->duration == GST_CLOCK_TIME_NONE || object->duration == 0) {
@@ -240,6 +241,15 @@ ges_timeline_filesource_set_max_duration (GESTimelineFileSource * self,
     g_object_set (self, "duration", self->priv->maxduration - object->inpoint,
         NULL);
   }
+
+  tckobjs = ges_timeline_object_get_track_objects (GES_TIMELINE_OBJECT (self));
+  for (tmp = tckobjs; tmp; tmp = g_list_next (tmp)) {
+    g_object_set (tmp->data, "max-duration", maxduration, NULL);
+
+    /* We free the list in the same loop */
+    g_object_unref (tmp->data);
+    g_list_free_1 (tmp);
+  }
 }
 
 /**

diff --git a/ges/ges-timeline.c b/ges/ges-timeline.c
index 1ba850811091727b1be0502c84104279d1ad7f75..4579f4a700e631b17e2b82b59ce4356a4f3125c5 100644 (file)
--- a/ges/ges-timeline.c
+++ b/ges/ges-timeline.c
@@ -579,7 +579,10 @@ discoverer_discovered_cb (GstDiscoverer * discoverer,
       g_object_set (tfs, "is_image", (gboolean) TRUE, NULL);
     }
 
-    else {
+    /* Continue the processing on tfs */
+    add_object_to_tracks (timeline, GES_TIMELINE_OBJECT (tfs));
+
+    if (!is_image) {
       g_object_set (tfs, "max-duration",
           gst_discoverer_info_get_duration (info), NULL);
     }

diff --git a/ges/ges-track-filesource.c b/ges/ges-track-filesource.c
index 85b9cb2604695726c3ff5490146e008a39931d70..91b6c39db62e99ae2b09f3e2c6f8472e60b8c503 100644 (file)
--- a/ges/ges-track-filesource.c
+++ b/ges/ges-track-filesource.c
@@ -34,14 +34,14 @@ G_DEFINE_TYPE (GESTrackFileSource, ges_track_filesource, GES_TYPE_TRACK_SOURCE);
 
 struct _GESTrackFileSourcePrivate
 {
-  /*  Dummy variable */
-  void *nothing;
+  guint64 maxduration;
 };
 
 enum
 {
   PROP_0,
-  PROP_URI
+  PROP_URI,
+  PROP_MAX_DURATION
 };
 
 static void
@@ -54,6 +54,9 @@ ges_track_filesource_get_property (GObject * object, guint property_id,
     case PROP_URI:
       g_value_set_string (value, tfs->uri);
       break;
+    case PROP_MAX_DURATION:
+      g_value_set_uint64 (value, tfs->priv->maxduration);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
   }
@@ -69,6 +72,9 @@ ges_track_filesource_set_property (GObject * object, guint property_id,
     case PROP_URI:
       tfs->uri = g_value_dup_string (value);
       break;
+    case PROP_MAX_DURATION:
+      tfs->priv->maxduration = g_value_get_uint64 (value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
   }
@@ -108,6 +114,19 @@ ges_track_filesource_class_init (GESTrackFileSourceClass * klass)
   object_class->set_property = ges_track_filesource_set_property;
   object_class->dispose = ges_track_filesource_dispose;
 
+  /**
+   * GESTrackFileSource:max-duration:
+   *
+   * The maximum duration (in nanoseconds) of the file.
+   *
+   * If not set before adding the object to a layer, it will be discovered
+   * asynchronously. Connect to 'notify::max-duration' to be notified of it.
+   */
+  g_object_class_install_property (object_class, PROP_MAX_DURATION,
+      g_param_spec_uint64 ("max-duration", "Maximum duration",
+          "The duration of the file", 0, G_MAXUINT64, GST_CLOCK_TIME_NONE,
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+
   /**
    * GESTrackFileSource:uri
    *