summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Saunier <thibault.saunier@collabora.com>2011-12-07 20:17:55 -0300
committerThibault Saunier <thibault.saunier@collabora.com>2012-01-11 11:56:16 -0300
commit4d802c124133a65307600826b2df2b06932d8e30 (patch)
treefc4b5f6c37d94b5f5cab4623fdd39ef20f2d87a5
parentc0d60b9d17709b4299f2a6cc078b8ff8f07faf77 (diff)
ges: Little fixes to timeline_object_g(s)et_supprted_formats
-rw-r--r--bindings/python/ges.defs29
-rw-r--r--ges/ges-timeline-object.c69
2 files changed, 51 insertions, 47 deletions
diff --git a/bindings/python/ges.defs b/bindings/python/ges.defs
index d397e371..e05e427c 100644
--- a/bindings/python/ges.defs
+++ b/bindings/python/ges.defs
@@ -692,15 +692,6 @@
)
)
-(define-method set_supported_formats
- (of-object "GESTimelineObject")
- (c-name "ges_timeline_object_set_supported_formats")
- (return-type "none")
- (parameters
- '("GESTrackType" "supportedformats")
- )
-)
-
(define-method set_is_image
(of-object "GESTimelineFileSource")
(c-name "ges_timeline_filesource_set_is_image")
@@ -735,12 +726,6 @@
)
(define-method get_supported_formats
- (of-object "GESTimelineObject")
- (c-name "ges_timeline_object_get_supported_formats")
- (return-type "GESTrackType")
-)
-
-(define-method get_supported_formats
(of-object "GESTimelineFileSource")
(c-name "ges_timeline_filesource_get_supported_formats")
(return-type "GESTrackType")
@@ -1105,6 +1090,20 @@
)
)
+(define-method get_supported_formats
+ (of-object "GESTimelineObject")
+ (c-name "ges_timeline_object_get_supported_formats")
+ (return-type "GESTrackType")
+)
+
+(define-method set_supported_formats
+ (of-object "GESTimelineObject")
+ (c-name "ges_timeline_object_set_supported_formats")
+ (return-type "none")
+ (parameters
+ '("GESTrackType" "supportedformats")
+ )
+)
(define-method objects_set_locked
(of-object "GESTimelineObject")
diff --git a/ges/ges-timeline-object.c b/ges/ges-timeline-object.c
index 91ecb98c..d23451b9 100644
--- a/ges/ges-timeline-object.c
+++ b/ges/ges-timeline-object.c
@@ -1381,6 +1381,43 @@ ges_timeline_object_copy (GESTimelineObject * object, gboolean * deep)
}
/**
+ * ges_timeline_object_set_supported_formats:
+ * @object: the #GESTimelineObject to set supported formats on
+ * @supportedformats: the #GESTrackType defining formats supported by @object
+ *
+ * Sets the formats supported by the file.
+ *
+ * Since: 0.10.XX
+ */
+void
+ges_timeline_object_set_supported_formats (GESTimelineObject * object,
+ GESTrackType supportedformats)
+{
+ g_return_if_fail (GES_IS_TIMELINE_OBJECT (object));
+
+ object->priv->supportedformats = supportedformats;
+}
+
+/**
+ * ges_timeline_object_get_supported_formats:
+ * @object: the #GESTimelineObject
+ *
+ * Get the formats supported by @object.
+ *
+ * Returns: The formats supported by @object.
+ *
+ * Since: 0.10.XX
+ */
+GESTrackType
+ges_timeline_object_get_supported_formats (GESTimelineObject * object)
+{
+ g_return_val_if_fail (GES_IS_TIMELINE_OBJECT (object),
+ GES_TRACK_TYPE_UNKNOWN);
+
+ return object->priv->supportedformats;
+}
+
+/**
* ges_timeline_object_objects_set_locked:
* @object: the #GESTimelineObject
* @locked: whether the #GESTrackObject contained in @object are locked to it.
@@ -1432,38 +1469,6 @@ update_height (GESTimelineObject * object)
}
}
-/**
- * ges_timeline_object_set_supported_formats:
- * @self: the #GESTimelineObject to set supported formats on
- * @supportedformats: the #GESTrackType defining formats supported by @self
- *
- * Sets the formats supported by the file.
- *
- * Since: 0.10.XX
- */
-void
-ges_timeline_object_set_supported_formats (GESTimelineObject * self,
- GESTrackType supportedformats)
-{
- self->priv->supportedformats = supportedformats;
-}
-
-/**
- * ges_timeline_object_get_supported_formats:
- * @self: the #GESTimelineObject
- *
- * Get the formats supported by @self.
- *
- * Returns: The formats supported by @self.
- *
- * Since: 0.10.XX
- */
-GESTrackType
-ges_timeline_object_get_supported_formats (GESTimelineObject * self)
-{
- return self->priv->supportedformats;
-}
-
/*
* PROPERTY NOTIFICATIONS FROM TRACK OBJECTS
*/