From f6dffd1822404522b8354ac453a911a0d98bfc61 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 16 May 2012 14:18:27 +0200 Subject: Fix player thread teardown/signals on OS X MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1) Realtime signals don’t exist in OS X 2) libao apparently locks a mutex in ao_play, which is locked again in ao_close and causes a deadlock Closes #256, although I’m considering the option of partially reverting 7df9371491e96a99c1e463f7787aede352ac5a37, as this introduces more nasty behavior than it solves. --- src/player.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/player.h') diff --git a/src/player.h b/src/player.h index 2261d44..1e04f9f 100644 --- a/src/player.h +++ b/src/player.h @@ -47,8 +47,8 @@ THE SOFTWARE. #define BAR_PLAYER_MS_TO_S_FACTOR 1000 #define BAR_PLAYER_BUFSIZE (WAITRESS_BUFFER_SIZE*2) -#define BAR_PLAYER_SIGSTOP SIGRTMIN -#define BAR_PLAYER_SIGCONT SIGRTMIN+1 +#define BAR_PLAYER_SIGSTOP SIGUSR1 +#define BAR_PLAYER_SIGCONT SIGUSR2 struct audioPlayer { unsigned char channels; -- cgit v1.2.3