aboutsummaryrefslogtreecommitdiffstats
path: root/src/audioOutputs
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-11-03 14:33:35 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-11-03 14:33:35 +0000
commitf1f5d668aa13885c77a8b16790c7c72bd60f8c52 (patch)
tree54ac46198f86745c12baaa996c7d0e7a897ac768 /src/audioOutputs
parentc5ce5f3c01af95093aea122a3be2b40288ab94e4 (diff)
downloadmpd-f1f5d668aa13885c77a8b16790c7c72bd60f8c52.tar.gz
mpd-f1f5d668aa13885c77a8b16790c7c72bd60f8c52.tar.xz
mpd-f1f5d668aa13885c77a8b16790c7c72bd60f8c52.zip
remove signal handling code from ao open() and close()
git-svn-id: https://svn.musicpd.org/mpd/trunk@2493 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/audioOutputs')
-rw-r--r--src/audioOutputs/audioOutput_ao.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/audioOutputs/audioOutput_ao.c b/src/audioOutputs/audioOutput_ao.c
index fde859690..83cc176fe 100644
--- a/src/audioOutputs/audioOutput_ao.c
+++ b/src/audioOutputs/audioOutput_ao.c
@@ -19,7 +19,6 @@
#include "../audioOutput.h"
#include "../conf.h"
#include "../log.h"
-#include "../sig_handlers.h"
#include <string.h>
#include <assert.h>
@@ -173,10 +172,8 @@ static void audioOutputAo_closeDevice(AudioOutput * audioOutput) {
AoData * ad = (AoData *) audioOutput->data;
if(ad->device) {
- blockSignals();
ao_close(ad->device);
ad->device = NULL;
- unblockSignals();
}
audioOutput->open = 0;
@@ -197,9 +194,7 @@ static int audioOutputAo_openDevice(AudioOutput * audioOutput,
format.byte_format = AO_FMT_NATIVE;
format.channels = audioFormat->channels;
- blockSignals();
ad->device = ao_open_live(ad->driverId, &format, ad->options);
- unblockSignals();
if(ad->device==NULL) return -1;