mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-05 10:12:20 +00:00
Misc cleaning
This commit is contained in:
parent
48b5903ef8
commit
fa5ed5111d
4 changed files with 5 additions and 33 deletions
|
@ -248,7 +248,7 @@ ges_timeline_element_class_init (GESTimelineElementClass * klass)
|
||||||
* @parent: new parent of self
|
* @parent: new parent of self
|
||||||
*
|
*
|
||||||
* Sets the parent of @self to @parent. The object's reference count will
|
* 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
|
* Returns: %TRUE if @parent could be set or %FALSE when @self
|
||||||
* already had a parent or @self and @parent are the same.
|
* already had a parent or @self and @parent are the same.
|
||||||
|
|
|
@ -71,12 +71,12 @@ GstDiscovererInfo *ges_uri_clip_asset_get_info (const GESUriClipAsset * sel
|
||||||
GstClockTime ges_uri_clip_asset_get_duration (GESUriClipAsset *self);
|
GstClockTime ges_uri_clip_asset_get_duration (GESUriClipAsset *self);
|
||||||
gboolean ges_uri_clip_asset_is_image (GESUriClipAsset *self);
|
gboolean ges_uri_clip_asset_is_image (GESUriClipAsset *self);
|
||||||
void ges_uri_clip_asset_new (const gchar *uri,
|
void ges_uri_clip_asset_new (const gchar *uri,
|
||||||
GCancellable *cancellable,
|
GCancellable *cancellable,
|
||||||
GAsyncReadyCallback callback,
|
GAsyncReadyCallback callback,
|
||||||
gpointer user_data);
|
gpointer user_data);
|
||||||
GESUriClipAsset* ges_uri_clip_asset_request_sync (const gchar *uri, GError **error);
|
GESUriClipAsset* ges_uri_clip_asset_request_sync (const gchar *uri, GError **error);
|
||||||
void ges_uri_clip_asset_set_timeout (GESUriClipAssetClass *class,
|
void ges_uri_clip_asset_set_timeout (GESUriClipAssetClass *class,
|
||||||
GstClockTime timeout);
|
GstClockTime timeout);
|
||||||
const GList * ges_uri_clip_asset_get_stream_assets (GESUriClipAsset *self);
|
const GList * ges_uri_clip_asset_get_stream_assets (GESUriClipAsset *self);
|
||||||
|
|
||||||
#define GES_TYPE_ASSET_TRACK_FILESOURCE ges_uri_source_asset_get_type()
|
#define GES_TYPE_ASSET_TRACK_FILESOURCE ges_uri_source_asset_get_type()
|
||||||
|
|
|
@ -29,20 +29,6 @@ gchar * ges_test_get_audio_video_uri (void);
|
||||||
gchar * ges_test_get_image_uri (void);
|
gchar * ges_test_get_image_uri (void);
|
||||||
gchar * ges_test_file_uri (const gchar *filename);
|
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) { \
|
#define gnl_object_check(gnlobj, start, duration, mstart, mduration, priority, active) { \
|
||||||
guint64 pstart, pdur, pmstart, pmdur, pprio, pact; \
|
guint64 pstart, pdur, pmstart, pmdur, pprio, pact; \
|
||||||
g_object_get (gnlobj, "start", &pstart, "duration", &pdur, \
|
g_object_get (gnlobj, "start", &pstart, "duration", &pdur, \
|
||||||
|
|
|
@ -103,20 +103,6 @@ GST_START_TEST (test_filesource_basic)
|
||||||
|
|
||||||
GST_END_TEST;
|
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
|
static gboolean
|
||||||
create_asset (AssetUri * asset_uri)
|
create_asset (AssetUri * asset_uri)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue