mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-07 23:12:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

toc, tocsetter: drop use of GSlice

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
This commit is contained in:
Tim-Philipp Müller 2023-01-07 19:40:16 +00:00 committed by GStreamer Marge Bot
parent 25f7fa1efc
commit 7d1675e42e
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
subprojects/gstreamer/gst/gsttoc.c
View file

@ -140,7 +140,7 @@ gst_toc_new (GstTocScope scope)
g_return_val_if_fail (scope == GST_TOC_SCOPE_GLOBAL || g_return_val_if_fail (scope == GST_TOC_SCOPE_GLOBAL ||
scope == GST_TOC_SCOPE_CURRENT, NULL); scope == GST_TOC_SCOPE_CURRENT, NULL);
toc = g_slice_new0 (GstToc); toc = g_new0 (GstToc, 1);
gst_mini_object_init (GST_MINI_OBJECT_CAST (toc), 0, GST_TYPE_TOC, gst_mini_object_init (GST_MINI_OBJECT_CAST (toc), 0, GST_TYPE_TOC,
(GstMiniObjectCopyFunction) gst_toc_copy, NULL, (GstMiniObjectCopyFunction) gst_toc_copy, NULL,
@ -269,7 +269,7 @@ gst_toc_entry_new_internal (GstTocEntryType type, const gchar * uid)
{ {
GstTocEntry *entry; GstTocEntry *entry;
entry = g_slice_new0 (GstTocEntry); entry = g_new0 (GstTocEntry, 1);
gst_mini_object_init (GST_MINI_OBJECT_CAST (entry), 0, GST_TYPE_TOC_ENTRY, gst_mini_object_init (GST_MINI_OBJECT_CAST (entry), 0, GST_TYPE_TOC_ENTRY,
(GstMiniObjectCopyFunction) gst_toc_entry_copy, NULL, (GstMiniObjectCopyFunction) gst_toc_entry_copy, NULL,
@ -313,7 +313,7 @@ gst_toc_free (GstToc * toc)
memset (toc, 0xff, sizeof (GstToc)); memset (toc, 0xff, sizeof (GstToc));
#endif #endif
g_slice_free (GstToc, toc); g_free (toc);
} }
static void static void
@ -333,7 +333,7 @@ gst_toc_entry_free (GstTocEntry * entry)
memset (entry, 0xff, sizeof (GstTocEntry)); memset (entry, 0xff, sizeof (GstTocEntry));
#endif #endif
g_slice_free (GstTocEntry, entry); g_free (entry);
} }
static GstTocEntry * static GstTocEntry *

4
subprojects/gstreamer/gst/gsttocsetter.c
View file

@ -78,7 +78,7 @@ gst_toc_data_free (gpointer p)
g_mutex_clear (&data->lock); g_mutex_clear (&data->lock);
g_slice_free (GstTocData, data); g_free (data);
} }
static GstTocData * static GstTocData *
@ -94,7 +94,7 @@ gst_toc_setter_get_data (GstTocSetter * setter)
g_mutex_lock (&create_mutex); g_mutex_lock (&create_mutex);
data = g_object_get_qdata (G_OBJECT (setter), gst_toc_key); data = g_object_get_qdata (G_OBJECT (setter), gst_toc_key);
if (!data) { if (!data) {
data = g_slice_new (GstTocData); data = g_new (GstTocData, 1);
g_mutex_init (&data->lock); g_mutex_init (&data->lock);
data->toc = NULL; data->toc = NULL;
g_object_set_qdata_full (G_OBJECT (setter), gst_toc_key, data, g_object_set_qdata_full (G_OBJECT (setter), gst_toc_key, data,