From bc8e97613fad7177ce17b5f04a966940a2c03f04 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Sun, 15 Feb 2004 19:29:47 +0000 Subject: exiting xine with arts audio freezes on BSD; this should be an arts bug, but mplayer works around this, so we could do the same ;) thanks to Fridtjof Busse for reporting and testing this CVS patchset: 6161 CVS date: 2004/02/15 19:29:47 --- ChangeLog | 1 + src/audio_out/audio_arts_out.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bfbda11a2..4ebdcc7f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ xine-lib (1-rc4) * new MOD demuxer * new, safer method for on-the-fly rewiring of post plugins * add iso-8859-9 and iso-8859-15 codepages into xine fonts + * work around freezing with arts on BSD xine-lib (1-rc3a) * new subtitle formats: jacobsub, subviewer 2.0, subrip 0.9 diff --git a/src/audio_out/audio_arts_out.c b/src/audio_out/audio_arts_out.c index 22f7ea3c2..6c209d925 100644 --- a/src/audio_out/audio_arts_out.c +++ b/src/audio_out/audio_arts_out.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_arts_out.c,v 1.24 2003/12/20 19:51:48 manfredtremmel Exp $ + * $Id: audio_arts_out.c,v 1.25 2004/02/15 19:29:47 mroi Exp $ */ #ifndef __sun /* _XOPEN_SOURCE causes build prob's on sunos */ @@ -227,7 +227,10 @@ static void ao_arts_exit(ao_driver_t *this_gen) arts_driver_t *this = (arts_driver_t *) this_gen; ao_arts_close(this_gen); + /* FIXME: arts_free() freezes on BSD, so don't use it there */ +#if !defined(__OpenBSD__) && !defined (__FreeBSD__) && !defined(__NetBSD__) arts_free(); +#endif free (this); } -- cgit v1.2.3