diff --git a/ges/ges-timeline-element.c b/ges/ges-timeline-element.c index d5a199b2d2..d1ef1975da 100644 --- a/ges/ges-timeline-element.c +++ b/ges/ges-timeline-element.c @@ -248,7 +248,7 @@ ges_timeline_element_class_init (GESTimelineElementClass * klass) * @parent: new parent of self * * Sets the parent of @self to @parent. The object's reference count will - * be incremented, and any floating reference will be removed (see g_object_ref_sink()). + * be incremented, and any floating reference will be removed (see gst_object_ref_sink()). * * Returns: %TRUE if @parent could be set or %FALSE when @self * already had a parent or @self and @parent are the same. diff --git a/ges/ges-uri-asset.h b/ges/ges-uri-asset.h index 10da0b5c3b..8235efa7a3 100644 --- a/ges/ges-uri-asset.h +++ b/ges/ges-uri-asset.h @@ -71,12 +71,12 @@ GstDiscovererInfo *ges_uri_clip_asset_get_info (const GESUriClipAsset * sel GstClockTime ges_uri_clip_asset_get_duration (GESUriClipAsset *self); gboolean ges_uri_clip_asset_is_image (GESUriClipAsset *self); void ges_uri_clip_asset_new (const gchar *uri, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); GESUriClipAsset* ges_uri_clip_asset_request_sync (const gchar *uri, GError **error); void ges_uri_clip_asset_set_timeout (GESUriClipAssetClass *class, - GstClockTime timeout); + GstClockTime timeout); const GList * ges_uri_clip_asset_get_stream_assets (GESUriClipAsset *self); #define GES_TYPE_ASSET_TRACK_FILESOURCE ges_uri_source_asset_get_type() diff --git a/tests/check/ges/test-utils.h b/tests/check/ges/test-utils.h index e4809d2ccb..094c03576d 100644 --- a/tests/check/ges/test-utils.h +++ b/tests/check/ges/test-utils.h @@ -29,20 +29,6 @@ gchar * ges_test_get_audio_video_uri (void); gchar * ges_test_get_image_uri (void); gchar * ges_test_file_uri (const gchar *filename); -#define gnl_object_check(gnlobj, start, duration, mstart, mduration, priority, active) { \ - guint64 pstart, pdur, pmstart, pmdur, pprio, pact; \ - g_object_get (gnlobj, "start", &pstart, "duration", &pdur, \ - "media-start", &pmstart, "media-duration", &pmdur, \ - "priority", &pprio, "active", &pact, \ - NULL); \ - assert_equals_uint64 (pstart, start); \ - assert_equals_uint64 (pdur, duration); \ - assert_equals_uint64 (pmstart, mstart); \ - assert_equals_uint64 (pmdur, mduration); \ - assert_equals_int (pprio, priority); \ - assert_equals_int (pact, active); \ - } - #define gnl_object_check(gnlobj, start, duration, mstart, mduration, priority, active) { \ guint64 pstart, pdur, pmstart, pmdur, pprio, pact; \ g_object_get (gnlobj, "start", &pstart, "duration", &pdur, \ diff --git a/tests/check/ges/uriclip.c b/tests/check/ges/uriclip.c index 4de3cc5d31..c2cbf05fd5 100644 --- a/tests/check/ges/uriclip.c +++ b/tests/check/ges/uriclip.c @@ -103,20 +103,6 @@ GST_START_TEST (test_filesource_basic) GST_END_TEST; -#define gnl_object_check(gnlobj, start, duration, mstart, mduration, priority, active) { \ - guint64 pstart, pdur, pmstart, pmdur, pprio, pact; \ - g_object_get (gnlobj, "start", &pstart, "duration", &pdur, \ - "media-start", &pmstart, "media-duration", &pmdur, \ - "priority", &pprio, "active", &pact, \ - NULL); \ - assert_equals_uint64 (pstart, start); \ - assert_equals_uint64 (pdur, duration); \ - assert_equals_uint64 (pmstart, mstart); \ - assert_equals_uint64 (pmdur, mduration); \ - assert_equals_int (pprio, priority); \ - assert_equals_int (pact, active); \ - } - static gboolean create_asset (AssetUri * asset_uri) {