mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-14 06:59:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

define callback function types; allow pa_signal_done() to be called even without prior pa_signal_init()

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2377 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-05-07 01:34:54 +00:00
parent 91fbb691a2
commit 44241ac243
2 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/pulse/mainloop-signal.c
View file

@ -3,7 +3,7 @@
/*** /***
This file is part of PulseAudio. This file is part of PulseAudio.
Copyright 2004-2006 Lennart Poettering Copyright 2004-2008 Lennart Poettering
Copyright 2006 Pierre Ossman <ossman@cendio.se> for Cendio AB Copyright 2006 Pierre Ossman <ossman@cendio.se> for Cendio AB
PulseAudio is free software; you can redistribute it and/or modify PulseAudio is free software; you can redistribute it and/or modify
@ -55,9 +55,9 @@ struct pa_signal_event {
#else #else
void (*saved_handler)(int sig); void (*saved_handler)(int sig);
#endif #endif
void (*callback) (pa_mainloop_api*a, pa_signal_event *e, int sig, void *userdata);
void *userdata; void *userdata;
void (*destroy_callback) (pa_mainloop_api*a, pa_signal_event*e, void *userdata); pa_signal_cb_t callback;
pa_signal_destroy_cb_t destroy_callback;
pa_signal_event *previous, *next; pa_signal_event *previous, *next;
}; };
@ -74,6 +74,7 @@ static void signal_handler(int sig) {
#ifndef HAVE_SIGACTION #ifndef HAVE_SIGACTION
signal(sig, signal_handler); signal(sig, signal_handler);
#endif #endif
pa_write(signal_pipe[1], &sig, sizeof(sig), NULL); pa_write(signal_pipe[1], &sig, sizeof(sig), NULL);
errno = saved_errno; errno = saved_errno;
@ -142,23 +143,21 @@ int pa_signal_init(pa_mainloop_api *a) {
} }
void pa_signal_done(void) { void pa_signal_done(void) {
pa_assert(api);
pa_assert(signal_pipe[0] >= 0);
pa_assert(signal_pipe[1] >= 0);
pa_assert(io_event);
while (signals) while (signals)
pa_signal_free(signals); pa_signal_free(signals);
api->io_free(io_event); if (io_event) {
io_event = NULL; pa_assert(api);
api->io_free(io_event);
io_event = NULL;
}
pa_close_pipe(signal_pipe); pa_close_pipe(signal_pipe);
api = NULL; api = NULL;
} }
pa_signal_event* pa_signal_new(int sig, void (*_callback) (pa_mainloop_api *api, pa_signal_event*e, int sig, void *userdata), void *userdata) { pa_signal_event* pa_signal_new(int sig, pa_signal_cb_t _callback, void *userdata) {
pa_signal_event *e = NULL; pa_signal_event *e = NULL;
#ifdef HAVE_SIGACTION #ifdef HAVE_SIGACTION
@ -223,7 +222,7 @@ void pa_signal_free(pa_signal_event *e) {
pa_xfree(e); pa_xfree(e);
} }
void pa_signal_set_destroy(pa_signal_event *e, void (*_callback) (pa_mainloop_api *api, pa_signal_event*e, void *userdata)) { void pa_signal_set_destroy(pa_signal_event *e, pa_signal_destroy_cb_t _callback) {
pa_assert(e); pa_assert(e);
e->destroy_callback = _callback; e->destroy_callback = _callback;

16
src/pulse/mainloop-signal.h
View file

@ -6,7 +6,7 @@
/*** /***
This file is part of PulseAudio. This file is part of PulseAudio.
Copyright 2004-2006 Lennart Poettering Copyright 2004-2008 Lennart Poettering
Copyright 2006 Pierre Ossman <ossman@cendio.se> for Cendio AB Copyright 2006 Pierre Ossman <ossman@cendio.se> for Cendio AB
PulseAudio is free software; you can redistribute it and/or modify PulseAudio is free software; you can redistribute it and/or modify
@ -39,23 +39,27 @@ PA_C_DECL_BEGIN
* signals. However, you may hook signal support into an abstract main loop via the routines defined herein. * signals. However, you may hook signal support into an abstract main loop via the routines defined herein.
*/ */
/** An opaque UNIX signal event source object */
typedef struct pa_signal_event pa_signal_event;
typedef void (*pa_signal_cb_t) (pa_mainloop_api *api, pa_signal_event*e, int sig, void *userdata);
typedef void (*pa_signal_destroy_cb_t) (pa_mainloop_api *api, pa_signal_event*e, void *userdata);
/** Initialize the UNIX signal subsystem and bind it to the specified main loop */ /** Initialize the UNIX signal subsystem and bind it to the specified main loop */
int pa_signal_init(pa_mainloop_api *api); int pa_signal_init(pa_mainloop_api *api);
/** Cleanup the signal subsystem */ /** Cleanup the signal subsystem */
void pa_signal_done(void); void pa_signal_done(void);
/** An opaque UNIX signal event source object */
typedef struct pa_signal_event pa_signal_event;
/** Create a new UNIX signal event source object */ /** Create a new UNIX signal event source object */
pa_signal_event* pa_signal_new(int sig, void (*callback) (pa_mainloop_api *api, pa_signal_event*e, int sig, void *userdata), void *userdata); pa_signal_event* pa_signal_new(int sig, pa_signal_cb_t callback, void *userdata);
/** Free a UNIX signal event source object */ /** Free a UNIX signal event source object */
void pa_signal_free(pa_signal_event *e); void pa_signal_free(pa_signal_event *e);
/** Set a function that is called when the signal event source is destroyed. Use this to free the userdata argument if required */ /** Set a function that is called when the signal event source is destroyed. Use this to free the userdata argument if required */
void pa_signal_set_destroy(pa_signal_event *e, void (*callback) (pa_mainloop_api *api, pa_signal_event*e, void *userdata)); void pa_signal_set_destroy(pa_signal_event *e, pa_signal_destroy_cb_t callback);
PA_C_DECL_END PA_C_DECL_END