mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-04 15:19:57 +00:00
Code Issues 1 Projects Releases Wiki Activity

toc: minor code clean-up

Browse source 
And get rid of g_list_prepend/g_list_reverse
anti-pattern while we're at it.
This commit is contained in:
Tim-Philipp Müller 2014-11-02 20:16:53 +00:00
parent 4c66d08d08
commit b77446bc6d
1 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
gst/gsttoc.c
View file

@ -388,6 +388,18 @@ gst_toc_find_entry (const GstToc * toc, const gchar * uid)
return NULL;
}
static GList *
gst_toc_deep_copy_toc_entries (GList * entry_list)
{
GQueue new_entries = G_QUEUE_INIT;
GList *l;
for (l = entry_list; l != NULL; l = l->next)
g_queue_push_tail (&new_entries, gst_toc_entry_copy (l->data));
return new_entries.head;
}
/**
* gst_toc_entry_copy:
* @entry: #GstTocEntry to copy.
@ -401,9 +413,8 @@ gst_toc_find_entry (const GstToc * toc, const gchar * uid)
static GstTocEntry *
gst_toc_entry_copy (const GstTocEntry * entry)
{
GstTocEntry *ret, *sub;
GstTocEntry *ret;
GstTagList *list;
GList *cur;
g_return_val_if_fail (entry != NULL, NULL);
@ -419,16 +430,7 @@ gst_toc_entry_copy (const GstTocEntry * entry)
ret->tags = list;
}
cur = entry->subentries;
while (cur != NULL) {
sub = gst_toc_entry_copy (cur->data);
if (sub != NULL)
ret->subentries = g_list_prepend (ret->subentries, sub);
cur = cur->next;
}
ret->subentries = g_list_reverse (ret->subentries);
ret->subentries = gst_toc_deep_copy_toc_entries (entry->subentries);
return ret;
}
@ -446,8 +448,6 @@ static GstToc *
gst_toc_copy (const GstToc * toc)
{
GstToc *ret;
GstTocEntry *entry;
GList *cur;
GstTagList *list;
g_return_val_if_fail (toc != NULL, NULL);
@ -460,16 +460,8 @@ gst_toc_copy (const GstToc * toc)
ret->tags = list;
}
cur = toc->entries;
while (cur != NULL) {
entry = gst_toc_entry_copy (cur->data);
ret->entries = gst_toc_deep_copy_toc_entries (toc->entries);
if (entry != NULL)
ret->entries = g_list_prepend (ret->entries, entry);
cur = cur->next;
}
ret->entries = g_list_reverse (ret->entries);
return ret;
}