From 88ba7f499947cc12bd87e8b379c4cdcaab898110 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 27 Feb 2004 21:29:04 +0000 Subject: [PATCH] gst/gstbuffer.h: remove gst_buffer_free, use gst_data_unref Original commit message from CVS: 2004-02-27 Benjamin Otte * gst/gstbuffer.h: remove gst_buffer_free, use gst_data_unref * gst/gstdata.c: (gst_data_get_type): use refcounting in GstData GBoxed registration * gst/gstdata.h: remove gst_data_free, use gst_data_unref --- ChangeLog | 9 +++++++++ gst/gstbuffer.h | 1 - gst/gstdata.c | 21 ++------------------- gst/gstdata.h | 1 - 4 files changed, 11 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index e0a1d64..891f8df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-02-27 Benjamin Otte + + * gst/gstbuffer.h: + remove gst_buffer_free, use gst_data_unref + * gst/gstdata.c: (gst_data_get_type): + use refcounting in GstData GBoxed registration + * gst/gstdata.h: + remove gst_data_free, use gst_data_unref + 2004-02-27 Johan Dahlin * gst/gstdata.c (gst_data_get_type): New function, register diff --git a/gst/gstbuffer.h b/gst/gstbuffer.h index b10dbcc..8fb65b1 100644 --- a/gst/gstbuffer.h +++ b/gst/gstbuffer.h @@ -132,7 +132,6 @@ void gst_buffer_stamp (GstBuffer *dest, const GstBuffer *src); #define gst_buffer_copy(buf) GST_BUFFER (gst_data_copy (GST_DATA (buf))) #define gst_buffer_is_writable(buf) gst_data_is_writable (GST_DATA (buf)) #define gst_buffer_copy_on_write(buf) GST_BUFFER (gst_data_copy_on_write (GST_DATA (buf))) -#define gst_buffer_free(buf) gst_data_free (GST_DATA (buf)) /* creating a subbuffer */ GstBuffer* gst_buffer_create_sub (GstBuffer *parent, guint offset, guint size); diff --git a/gst/gstdata.c b/gst/gstdata.c index eaa2691..57fa3bd 100644 --- a/gst/gstdata.c +++ b/gst/gstdata.c @@ -34,8 +34,8 @@ gst_data_get_type (void) if (!type) type = g_boxed_type_register_static ("GstData", - (GBoxedCopyFunc) gst_data_copy, - (GBoxedFreeFunc) gst_data_free); + (GBoxedCopyFunc) gst_data_ref, + (GBoxedFreeFunc) gst_data_unref); return type; } @@ -169,23 +169,6 @@ gst_data_copy_on_write (GstData *data) } /** - * gst_data_free: - * @data: a #GstData to free - * - * Frees the given #GstData. This function will call the custom free function - * provided by the subclass. - */ -void -gst_data_free (GstData *data) -{ - if (!data) - return; - - if (data->free) - data->free (data); -} - -/** * gst_data_ref: * @data: a #GstData to reference * diff --git a/gst/gstdata.h b/gst/gstdata.h index a9e3050..1c3da1f 100644 --- a/gst/gstdata.h +++ b/gst/gstdata.h @@ -92,7 +92,6 @@ void gst_data_copy_into (const GstData *data, GstData *target); GstData* gst_data_copy (const GstData *data); gboolean gst_data_is_writable (GstData *data); GstData* gst_data_copy_on_write (GstData *data); -void gst_data_free (GstData *data); /* reference counting */ GstData* gst_data_ref (GstData* data); -- 2.7.4