Mercurial > audlegacy
changeset 1278:7baea4fb20a4 trunk
[svn] - fix for alsa_mutex deadlock
- fix for alsa_mutex scope
| author | yaz |
|---|---|
| date | Fri, 16 Jun 2006 06:13:21 -0700 |
| parents | 8c8d4841efae |
| children | 01d2aa561b53 |
| files | ChangeLog Plugins/Output/alsa/audio.c |
| diffstat | 2 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jun 16 03:50:38 2006 -0700 +++ b/ChangeLog Fri Jun 16 06:13:21 2006 -0700 @@ -1,3 +1,12 @@ +2006-06-16 10:50:38 +0000 William Pitcock <nenolod@nenolod.net> + revision [1468] + - if entry->tuple == NULL, then probe the file for a decoder and build the appropriate tuple for that entry + + + Changes: Modified: + +11 -0 trunk/audacious/playlist.c + + 2006-06-16 09:58:33 +0000 George Averill <nhjm449@gmail.com> revision [1466] - Buffer indicator support for anyone crazy enough to stream flac.
--- a/Plugins/Output/alsa/audio.c Fri Jun 16 03:50:38 2006 -0700 +++ b/Plugins/Output/alsa/audio.c Fri Jun 16 06:13:21 2006 -0700 @@ -64,7 +64,7 @@ static gboolean pause_request; /* pause status currently requested */ static int flush_request; /* flush status (time) currently requested */ static int prebuffer_size; -static GMutex *alsa_mutex; +GMutex *alsa_mutex; static guint mixer_timeout; @@ -257,14 +257,14 @@ if (!going) return; - g_mutex_lock(alsa_mutex); - debug("Closing device"); going = 0; g_thread_join(audio_thread); + g_mutex_lock(alsa_mutex); /* alsa_loop locks alsa_mutex! */ + alsa_cleanup_mixer(); xmms_convert_buffers_destroy(convertb);