mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-04 07:26:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

Properly rename object-added to clip-added

Browse source
This commit is contained in:
Thibault Saunier 2013-02-08 17:19:39 -03:00
parent 4ddcfb642d
commit fc8f06eedb
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ges/ges-clip.c
View file

@ -599,7 +599,7 @@ ges_clip_release_track_element (GESClip * object,
object->trackelements = g_list_remove (object->trackelements, trackelement); object->trackelements = g_list_remove (object->trackelements, trackelement);
if (GES_IS_BASE_EFFECT (trackelement)) { if (GES_IS_BASE_EFFECT (trackelement)) {
/* emit 'object-removed' */ /* emit 'clip-removed' */
object->priv->nb_effects--; object->priv->nb_effects--;
g_signal_emit (object, ges_clip_signals[EFFECT_REMOVED], 0, g_signal_emit (object, ges_clip_signals[EFFECT_REMOVED], 0,
GES_BASE_EFFECT (trackelement)); GES_BASE_EFFECT (trackelement));

12
ges/ges-timeline-layer.c
View file

@ -169,26 +169,26 @@ ges_timeline_layer_class_init (GESTimelineLayerClass * klass)
"whether the transitions are added", FALSE, G_PARAM_READWRITE)); "whether the transitions are added", FALSE, G_PARAM_READWRITE));
/** /**
* GESTimelineLayer::object-added: * GESTimelineLayer::clip-added:
* @layer: the #GESTimelineLayer * @layer: the #GESTimelineLayer
* @object: the #GESClip that was added. * @object: the #GESClip that was added.
* *
* Will be emitted after the object was added to the layer. * Will be emitted after the object was added to the layer.
*/ */
ges_timeline_layer_signals[OBJECT_ADDED] = ges_timeline_layer_signals[OBJECT_ADDED] =
g_signal_new ("object-added", G_TYPE_FROM_CLASS (klass), g_signal_new ("clip-added", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineLayerClass, object_added), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineLayerClass, object_added),
NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, GES_TYPE_CLIP); NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, GES_TYPE_CLIP);
/** /**
* GESTimelineLayer::object-removed: * GESTimelineLayer::clip-removed:
* @layer: the #GESTimelineLayer * @layer: the #GESTimelineLayer
* @object: the #GESClip that was removed * @object: the #GESClip that was removed
* *
* Will be emitted after the object was removed from the layer. * Will be emitted after the object was removed from the layer.
*/ */
ges_timeline_layer_signals[OBJECT_REMOVED] = ges_timeline_layer_signals[OBJECT_REMOVED] =
g_signal_new ("object-removed", G_TYPE_FROM_CLASS (klass), g_signal_new ("clip-removed", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineLayerClass, G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineLayerClass,
object_removed), NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, object_removed), NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE,
1, GES_TYPE_CLIP); 1, GES_TYPE_CLIP);
@ -311,7 +311,7 @@ ges_timeline_layer_remove_object (GESTimelineLayer * layer, GESClip * object)
} }
g_object_unref (current_layer); g_object_unref (current_layer);
/* emit 'object-removed' */ /* emit 'clip-removed' */
g_signal_emit (layer, ges_timeline_layer_signals[OBJECT_REMOVED], 0, object); g_signal_emit (layer, ges_timeline_layer_signals[OBJECT_REMOVED], 0, object);
/* inform the object it's no longer in a layer */ /* inform the object it's no longer in a layer */
@ -555,7 +555,7 @@ ges_timeline_layer_add_object (GESTimelineLayer * layer, GESClip * object)
* priority */ * priority */
ges_timeline_layer_resync_priorities (layer); ges_timeline_layer_resync_priorities (layer);
/* emit 'object-added' */ /* emit 'clip-added' */
g_signal_emit (layer, ges_timeline_layer_signals[OBJECT_ADDED], 0, object); g_signal_emit (layer, ges_timeline_layer_signals[OBJECT_ADDED], 0, object);
return TRUE; return TRUE;

6
ges/ges-timeline.c
View file

@ -2281,10 +2281,10 @@ ges_timeline_add_layer (GESTimeline * timeline, GESTimelineLayer * layer)
g_hash_table_insert (timeline->priv->by_layer, layer, g_sequence_new (NULL)); g_hash_table_insert (timeline->priv->by_layer, layer, g_sequence_new (NULL));
/* Connect to 'object-added'/'object-removed' signal from the new layer */ /* Connect to 'clip-added'/'clip-removed' signal from the new layer */
g_signal_connect (layer, "object-added", G_CALLBACK (layer_object_added_cb), g_signal_connect (layer, "clip-added", G_CALLBACK (layer_object_added_cb),
timeline); timeline);
g_signal_connect (layer, "object-removed", g_signal_connect (layer, "clip-removed",
G_CALLBACK (layer_object_removed_cb), timeline); G_CALLBACK (layer_object_removed_cb), timeline);
g_signal_connect (layer, "notify::priority", g_signal_connect (layer, "notify::priority",
G_CALLBACK (layer_priority_changed_cb), timeline); G_CALLBACK (layer_priority_changed_cb), timeline);

4
tests/examples/ges-ui.c
View file

@ -758,9 +758,9 @@ layer_added_cb (GESTimeline * timeline, GESTimelineLayer * layer, App * app)
return; return;
} }
g_signal_connect (app->layer, "object-added", g_signal_connect (app->layer, "clip-added",
G_CALLBACK (layer_object_added_cb), app); G_CALLBACK (layer_object_added_cb), app);
g_signal_connect (app->layer, "object-removed", g_signal_connect (app->layer, "clip-removed",
G_CALLBACK (layer_object_removed_cb), app); G_CALLBACK (layer_object_removed_cb), app);
g_signal_connect (app->layer, "object-moved", g_signal_connect (app->layer, "object-moved",
G_CALLBACK (layer_object_moved_cb), app); G_CALLBACK (layer_object_moved_cb), app);