mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-02 08:42:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

TrackObject: Small cleanup

Browse source
This commit is contained in:
Edward Hervey 2011-01-10 15:10:01 +01:00
parent 4b5d350121
commit 38d306db2e
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
ges/ges-track-object.c
View file

@ -626,7 +626,7 @@ ensure_gnl_object (GESTrackObject * object)
{ {
GESTrackObjectClass *class; GESTrackObjectClass *class;
GstElement *gnlobject; GstElement *gnlobject;
gboolean res = TRUE; gboolean res = FALSE;
if (object->priv->gnlobject && object->priv->valid) if (object->priv->gnlobject && object->priv->valid)
return FALSE; return FALSE;
@ -638,7 +638,7 @@ ensure_gnl_object (GESTrackObject * object)
if (G_UNLIKELY (class->create_gnl_object == NULL)) { if (G_UNLIKELY (class->create_gnl_object == NULL)) {
GST_ERROR ("No 'create_gnl_object' implementation !"); GST_ERROR ("No 'create_gnl_object' implementation !");
return FALSE; goto done;
} }
GST_DEBUG ("Calling virtual method"); GST_DEBUG ("Calling virtual method");
@ -649,24 +649,11 @@ ensure_gnl_object (GESTrackObject * object)
if (G_UNLIKELY (gnlobject == NULL)) { if (G_UNLIKELY (gnlobject == NULL)) {
GST_ERROR GST_ERROR
("'create_gnl_object' implementation returned TRUE but no GnlObject is available"); ("'create_gnl_object' implementation returned TRUE but no GnlObject is available");
return FALSE; goto done;
} }
object->priv->gnlobject = gnlobject; object->priv->gnlobject = gnlobject;
/* Connect to property notifications */
/* FIXME : remember the signalids so we can remove them later on !!! */
g_signal_connect (G_OBJECT (object->priv->gnlobject), "notify::start",
G_CALLBACK (gnlobject_start_cb), object);
g_signal_connect (G_OBJECT (object->priv->gnlobject), "notify::media-start",
G_CALLBACK (gnlobject_media_start_cb), object);
g_signal_connect (G_OBJECT (object->priv->gnlobject), "notify::duration",
G_CALLBACK (gnlobject_duration_cb), object);
g_signal_connect (G_OBJECT (object->priv->gnlobject), "notify::priority",
G_CALLBACK (gnlobject_priority_cb), object);
g_signal_connect (G_OBJECT (object->priv->gnlobject), "notify::active",
G_CALLBACK (gnlobject_active_cb), object);
/* 2. Fill in the GnlObject */ /* 2. Fill in the GnlObject */
if (gnlobject) { if (gnlobject) {
GST_DEBUG ("Got a valid GnlObject, now filling it in"); GST_DEBUG ("Got a valid GnlObject, now filling it in");
@ -675,6 +662,19 @@ ensure_gnl_object (GESTrackObject * object)
ges_timeline_object_fill_track_object (object->priv->timelineobj, ges_timeline_object_fill_track_object (object->priv->timelineobj,
object, object->priv->gnlobject); object, object->priv->gnlobject);
if (res) { if (res) {
/* Connect to property notifications */
/* FIXME : remember the signalids so we can remove them later on !!! */
g_signal_connect (G_OBJECT (object->priv->gnlobject), "notify::start",
G_CALLBACK (gnlobject_start_cb), object);
g_signal_connect (G_OBJECT (object->priv->gnlobject),
"notify::media-start", G_CALLBACK (gnlobject_media_start_cb), object);
g_signal_connect (G_OBJECT (object->priv->gnlobject), "notify::duration",
G_CALLBACK (gnlobject_duration_cb), object);
g_signal_connect (G_OBJECT (object->priv->gnlobject), "notify::priority",
G_CALLBACK (gnlobject_priority_cb), object);
g_signal_connect (G_OBJECT (object->priv->gnlobject), "notify::active",
G_CALLBACK (gnlobject_active_cb), object);
/* Set some properties on the GnlObject */ /* Set some properties on the GnlObject */
g_object_set (object->priv->gnlobject, g_object_set (object->priv->gnlobject,
"caps", ges_track_get_caps (object->priv->track), "caps", ges_track_get_caps (object->priv->track),
@ -688,6 +688,7 @@ ensure_gnl_object (GESTrackObject * object)
} }
} }
done:
object->priv->valid = res; object->priv->valid = res;
GST_DEBUG ("Returning res:%d", res); GST_DEBUG ("Returning res:%d", res);