From d5706e78aade832ed0aec0b977a0de9460d852ea Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Sun, 4 Mar 2007 17:13:19 +0000 Subject: ext/cdio/gstcdiocddasrc.c: Make sure we always destroy our libcdio handle. Original commit message from CVS: * ext/cdio/gstcdiocddasrc.c: (gst_cdio_cdda_src_open), (gst_cdio_cdda_src_finalize): Make sure we always destroy our libcdio handle. --- ChangeLog | 6 ++++++ ext/cdio/gstcdiocddasrc.c | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8f9b76c8..b357840d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-03-04 Jan Schmidt + + * ext/cdio/gstcdiocddasrc.c: (gst_cdio_cdda_src_open), + (gst_cdio_cdda_src_finalize): + Make sure we always destroy our libcdio handle. + 2007-03-04 Jan Schmidt * tests/check/Makefile.am: diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c index 0e8967ea..ca3258ee 100644 --- a/ext/cdio/gstcdiocddasrc.c +++ b/ext/cdio/gstcdiocddasrc.c @@ -287,6 +287,9 @@ not_audio: { GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (_("Disc is not an Audio CD.")), ("discmode: %d", (gint) discmode)); + + cdio_destroy (src->cdio); + src->cdio = NULL; return FALSE; } } @@ -312,6 +315,13 @@ gst_cdio_cdda_src_init (GstCdioCddaSrc * src, GstCdioCddaSrcClass * klass) static void gst_cdio_cdda_src_finalize (GObject * obj) { + GstCdioCddaSrc *src = GST_CDIO_CDDA_SRC (obj); + + if (src->cdio) { + cdio_destroy (src->cdio); + src->cdio = NULL; + } + G_OBJECT_CLASS (parent_class)->finalize (obj); } -- cgit