mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

timeline: Rename group_id to stream_start_group_id

Browse source
This commit is contained in:
Thibault Saunier 2019-03-03 20:59:12 -03:00 committed by Thibault Saunier
parent 4a1679f698
commit fa909a7cef
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ges/ges-timeline.c
View file

@ -200,7 +200,7 @@ struct _GESTimelinePrivate
GESClip *ignore_track_element_added; GESClip *ignore_track_element_added;
GList *groups; GList *groups;
guint group_id; guint stream_start_group_id;
GHashTable *all_elements; GHashTable *all_elements;
@ -696,7 +696,7 @@ ges_timeline_init (GESTimeline * self)
priv->all_elements = priv->all_elements =
g_hash_table_new_full (g_str_hash, g_str_equal, g_free, gst_object_unref); g_hash_table_new_full (g_str_hash, g_str_equal, g_free, gst_object_unref);
priv->group_id = -1; priv->stream_start_group_id = -1;
g_signal_connect_after (self, "select-tracks-for-object", g_signal_connect_after (self, "select-tracks-for-object",
G_CALLBACK (select_tracks_for_object_default), NULL); G_CALLBACK (select_tracks_for_object_default), NULL);
@ -2742,14 +2742,15 @@ _pad_probe_cb (GstPad * mixer_pad, GstPadProbeInfo * info,
GstEvent *event = GST_PAD_PROBE_INFO_EVENT (info); GstEvent *event = GST_PAD_PROBE_INFO_EVENT (info);
if (GST_EVENT_TYPE (event) == GST_EVENT_STREAM_START) { if (GST_EVENT_TYPE (event) == GST_EVENT_STREAM_START) {
LOCK_DYN (timeline); LOCK_DYN (timeline);
if (timeline->priv->group_id == -1) { if (timeline->priv->stream_start_group_id == -1) {
if (!gst_event_parse_group_id (event, &timeline->priv->group_id)) if (!gst_event_parse_group_id (event,
timeline->priv->group_id = gst_util_group_id_next (); &timeline->priv->stream_start_group_id))
timeline->priv->stream_start_group_id = gst_util_group_id_next ();
} }
info->data = gst_event_make_writable (event); info->data = gst_event_make_writable (event);
gst_event_set_group_id (GST_PAD_PROBE_INFO_EVENT (info), gst_event_set_group_id (GST_PAD_PROBE_INFO_EVENT (info),
timeline->priv->group_id); timeline->priv->stream_start_group_id);
UNLOCK_DYN (timeline); UNLOCK_DYN (timeline);
return GST_PAD_PROBE_REMOVE; return GST_PAD_PROBE_REMOVE;