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

layer: factor out a method to remove an object without signaling it

Browse source
This commit is contained in:
Thibault Saunier 2019-02-08 17:48:26 -03:00 committed by Thibault Saunier
parent df731aba35
commit b4bdf51935
1 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
ges/ges-layer.c
View file

@ -379,28 +379,12 @@ ges_layer_get_duration (GESLayer * layer)
return duration; return duration;
} }
/* Public methods */ static gboolean
/** ges_layer_remove_clip_internal (GESLayer * layer, GESClip * clip,
* ges_layer_remove_clip: gboolean emit_removed)
* @layer: a #GESLayer
* @clip: the #GESClip to remove
*
* Removes the given @clip from the @layer and unparents it.
* Unparenting it means the reference owned by @layer on the @clip will be
* removed. If you wish to use the @clip after this function, make sure you
* call gst_object_ref() before removing it from the @layer.
*
* Returns: %TRUE if the clip could be removed, %FALSE if the layer does
* not want to remove the clip.
*/
gboolean
ges_layer_remove_clip (GESLayer * layer, GESClip * clip)
{ {
GESLayer *current_layer; GESLayer *current_layer;
g_return_val_if_fail (GES_IS_LAYER (layer), FALSE);
g_return_val_if_fail (GES_IS_CLIP (clip), FALSE);
GST_DEBUG ("layer:%p, clip:%p", layer, clip); GST_DEBUG ("layer:%p, clip:%p", layer, clip);
current_layer = ges_clip_get_layer (clip); current_layer = ges_clip_get_layer (clip);
@ -417,8 +401,10 @@ ges_layer_remove_clip (GESLayer * layer, GESClip * clip)
/* Remove it from our list of controlled objects */ /* Remove it from our list of controlled objects */
layer->priv->clips_start = g_list_remove (layer->priv->clips_start, clip); layer->priv->clips_start = g_list_remove (layer->priv->clips_start, clip);
if (emit_removed) {
/* emit 'clip-removed' */ /* emit 'clip-removed' */
g_signal_emit (layer, ges_layer_signals[OBJECT_REMOVED], 0, clip); g_signal_emit (layer, ges_layer_signals[OBJECT_REMOVED], 0, clip);
}
/* inform the clip it's no longer in a layer */ /* inform the clip it's no longer in a layer */
ges_clip_set_layer (clip, NULL); ges_clip_set_layer (clip, NULL);
@ -432,6 +418,29 @@ ges_layer_remove_clip (GESLayer * layer, GESClip * clip)
return TRUE; return TRUE;
} }
/* Public methods */
/**
* ges_layer_remove_clip:
* @layer: a #GESLayer
* @clip: the #GESClip to remove
*
* Removes the given @clip from the @layer and unparents it.
* Unparenting it means the reference owned by @layer on the @clip will be
* removed. If you wish to use the @clip after this function, make sure you
* call gst_object_ref() before removing it from the @layer.
*
* Returns: %TRUE if the clip could be removed, %FALSE if the layer does
* not want to remove the clip.
*/
gboolean
ges_layer_remove_clip (GESLayer * layer, GESClip * clip)
{
g_return_val_if_fail (GES_IS_LAYER (layer), FALSE);
g_return_val_if_fail (GES_IS_CLIP (clip), FALSE);
return ges_layer_remove_clip_internal (layer, clip, TRUE);
}
/** /**
* ges_layer_set_priority: * ges_layer_set_priority:
* @layer: a #GESLayer * @layer: a #GESLayer