diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2009-06-24 10:45:52 +0200 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2009-06-24 11:00:27 +0200 |
| commit | 43dba6cefc15af76c4da48d87d84e2e39b71a5f0 (patch) | |
| tree | 79d8a45e73e7ece4ea1b00300a99ae368adcae98 /gst | |
| parent | 5d819beffba6d7f33f09317e4abdff2fa2450e93 (diff) | |
miniobjects: Don't chain up to empty finalize method.
If ever we do anything in mini_object_finalize, we should make sure the 4
core miniobject finalize methods chain back up again.
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/gstbuffer.c | 4 | ||||
| -rw-r--r-- | gst/gstevent.c | 2 | ||||
| -rw-r--r-- | gst/gstmessage.c | 2 | ||||
| -rw-r--r-- | gst/gstminiobject.c | 8 | ||||
| -rw-r--r-- | gst/gstquery.c | 2 |
5 files changed, 13 insertions, 5 deletions
diff --git a/gst/gstbuffer.c b/gst/gstbuffer.c index 9adad9e11..9919211a8 100644 --- a/gst/gstbuffer.c +++ b/gst/gstbuffer.c @@ -165,8 +165,8 @@ gst_buffer_finalize (GstBuffer * buffer) gst_caps_replace (&GST_BUFFER_CAPS (buffer), NULL); - ((GstMiniObjectClass *) - gst_buffer_parent_class)->finalize (GST_MINI_OBJECT_CAST (buffer)); +/* ((GstMiniObjectClass *) */ +/* gst_buffer_parent_class)->finalize (GST_MINI_OBJECT_CAST (buffer)); */ } /** diff --git a/gst/gstevent.c b/gst/gstevent.c index ba208c1ea..fceb25688 100644 --- a/gst/gstevent.c +++ b/gst/gstevent.c @@ -231,7 +231,7 @@ gst_event_finalize (GstEvent * event) gst_structure_free (event->structure); } - GST_MINI_OBJECT_CLASS (parent_class)->finalize (GST_MINI_OBJECT (event)); +/* GST_MINI_OBJECT_CLASS (parent_class)->finalize (GST_MINI_OBJECT (event)); */ } static GstEvent * diff --git a/gst/gstmessage.c b/gst/gstmessage.c index 10bac83f4..80fd0c294 100644 --- a/gst/gstmessage.c +++ b/gst/gstmessage.c @@ -207,7 +207,7 @@ gst_message_finalize (GstMessage * message) gst_structure_free (message->structure); } - GST_MINI_OBJECT_CLASS (parent_class)->finalize (GST_MINI_OBJECT (message)); +/* GST_MINI_OBJECT_CLASS (parent_class)->finalize (GST_MINI_OBJECT (message)); */ } static GstMessage * diff --git a/gst/gstminiobject.c b/gst/gstminiobject.c index 46526b723..2386dba05 100644 --- a/gst/gstminiobject.c +++ b/gst/gstminiobject.c @@ -159,6 +159,14 @@ static void gst_mini_object_finalize (GstMiniObject * obj) { /* do nothing */ + + /* WARNING: if anything is ever put in this method, make sure that the + * following sub-classes' finalize method chains up to this one: + * gstbuffer + * gstevent + * gstmessage + * gstquery + */ } /** diff --git a/gst/gstquery.c b/gst/gstquery.c index acbc66157..fe771e664 100644 --- a/gst/gstquery.c +++ b/gst/gstquery.c @@ -191,7 +191,7 @@ gst_query_finalize (GstQuery * query) gst_structure_free (query->structure); } - GST_MINI_OBJECT_CLASS (parent_class)->finalize (GST_MINI_OBJECT (query)); +/* GST_MINI_OBJECT_CLASS (parent_class)->finalize (GST_MINI_OBJECT (query)); */ } static GstQuery * |