mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 19:55:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

tree: Fixup some GList leaks

Browse source
This commit is contained in:
Thibault Saunier 2019-03-28 11:08:58 -03:00
parent 05d919a2eb
commit 7d7be4eecd
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ges/ges-timeline-tree.c
View file

@ -556,6 +556,8 @@ timeline_tree_can_move_element (GNode * root,
GESTimelineElement *toplevel; GESTimelineElement *toplevel;
GstClockTimeDiff start_offset, duration_offset; GstClockTimeDiff start_offset, duration_offset;
gint64 priority_diff; gint64 priority_diff;
gboolean res;
GList *local_moving_track_elements = g_list_copy (moving_track_elements);
toplevel = get_toplevel_container (element); toplevel = get_toplevel_container (element);
if (ELEMENT_FLAG_IS_SET (element, GES_TIMELINE_ELEMENT_SET_SIMPLE) || if (ELEMENT_FLAG_IS_SET (element, GES_TIMELINE_ELEMENT_SET_SIMPLE) ||
@ -570,14 +572,17 @@ timeline_tree_can_move_element (GNode * root,
g_node_traverse (find_node (root, toplevel), G_IN_ORDER, g_node_traverse (find_node (root, toplevel), G_IN_ORDER,
G_TRAVERSE_LEAVES, -1, (GNodeTraverseFunc) add_element_to_list, G_TRAVERSE_LEAVES, -1, (GNodeTraverseFunc) add_element_to_list,
&moving_track_elements); &local_moving_track_elements);
return timeline_tree_can_move_element_internal (root, toplevel, res = timeline_tree_can_move_element_internal (root, toplevel,
GES_TIMELINE_ELEMENT_LAYER_PRIORITY (toplevel) - priority_diff, GES_TIMELINE_ELEMENT_LAYER_PRIORITY (toplevel) - priority_diff,
GST_CLOCK_DIFF (start_offset, toplevel->start), GST_CLOCK_DIFF (start_offset, toplevel->start),
toplevel->inpoint, toplevel->inpoint,
GST_CLOCK_DIFF (duration_offset, toplevel->duration), GST_CLOCK_DIFF (duration_offset, toplevel->duration),
moving_track_elements, GST_CLOCK_TIME_NONE, NULL, GES_EDGE_NONE); local_moving_track_elements, GST_CLOCK_TIME_NONE, NULL, GES_EDGE_NONE);
g_list_free (local_moving_track_elements);
return res;
} }
static void static void
@ -910,8 +915,6 @@ timeline_tree_trim (GNode * root, GESTimelineElement * element,
timeline_update_transition (root->data); timeline_update_transition (root->data);
timeline_update_duration (root->data); timeline_update_duration (root->data);
return TRUE;
done: done:
clean_iteration_data (&data); clean_iteration_data (&data);
return res; return res;
@ -956,7 +959,7 @@ timeline_tree_move (GNode * root, GESTimelineElement * element,
if (!timeline_tree_can_move_element_from_data (root, &data)) { if (!timeline_tree_can_move_element_from_data (root, &data)) {
GST_INFO ("Can not move object."); GST_INFO ("Can not move object.");
return FALSE; goto error;
} }
if (snapping_distance) { if (snapping_distance) {
@ -1012,10 +1015,13 @@ timeline_tree_move (GNode * root, GESTimelineElement * element,
GST_LOG ("Moved %" GES_FORMAT, GES_ARGS (element)); GST_LOG ("Moved %" GES_FORMAT, GES_ARGS (element));
done:
clean_iteration_data (&data);
return res; return res;
error: error:
return FALSE; res = FALSE;
goto done;
} }
static gboolean static gboolean