oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

remove signal handling code from ao open() and close()

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2493 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes
2004-11-03 14:33:35 +00:00
parent c5ce5f3c01
commit f1f5d668aa
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/audioOutputs/audioOutput_ao.c
View File

@@ -19,7 +19,6 @@
#include "../audioOutput.h" #include "../audioOutput.h"
#include "../conf.h" #include "../conf.h"
#include "../log.h" #include "../log.h"
#include "../sig_handlers.h"
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
@@ -173,10 +172,8 @@ static void audioOutputAo_closeDevice(AudioOutput * audioOutput) {
AoData * ad = (AoData *) audioOutput->data; AoData * ad = (AoData *) audioOutput->data;
if(ad->device) { if(ad->device) {
blockSignals();
ao_close(ad->device); ao_close(ad->device);
ad->device = NULL; ad->device = NULL;
unblockSignals();
} }
audioOutput->open = 0; audioOutput->open = 0;
@@ -197,9 +194,7 @@ static int audioOutputAo_openDevice(AudioOutput * audioOutput,
format.byte_format = AO_FMT_NATIVE; format.byte_format = AO_FMT_NATIVE;
format.channels = audioFormat->channels; format.channels = audioFormat->channels;
blockSignals();
ad->device = ao_open_live(ad->driverId, &format, ad->options); ad->device = ao_open_live(ad->driverId, &format, ad->options);
unblockSignals();
if(ad->device==NULL) return -1; if(ad->device==NULL) return -1;