diff options
| author | Lennart Poettering <lennart@poettering.net> | 2004-08-05 19:53:57 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2004-08-05 19:53:57 +0000 |
| commit | 964bdfd1e8255b57e9d22cd22b3784e2fc79b905 (patch) | |
| tree | 11676e2930adb42af6ac00e721c4b2a73baf35ef /polyp/main.c | |
| parent | 839f99ffbf5b01e585845a061830a6fa5f0743dc (diff) | |
add initial glib mainloop adapter
clean up mainloop API
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@105 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp/main.c')
| -rw-r--r-- | polyp/main.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/polyp/main.c b/polyp/main.c index de66f1c8..9f3d3406 100644 --- a/polyp/main.c +++ b/polyp/main.c @@ -46,13 +46,12 @@ static struct pa_mainloop *mainloop; -static void exit_signal_callback(void *id, int sig, void *userdata) { - struct pa_mainloop_api* m = pa_mainloop_get_api(mainloop); +static void exit_signal_callback(struct pa_mainloop_api*m, struct pa_signal_event *e, int sig, void *userdata) { m->quit(m, 1); fprintf(stderr, __FILE__": got signal.\n"); } -static void aux_signal_callback(void *id, int sig, void *userdata) { +static void aux_signal_callback(struct pa_mainloop_api*m, struct pa_signal_event *e, int sig, void *userdata) { struct pa_core *c = userdata; assert(c); pa_module_load(c, sig == SIGUSR1 ? "module-cli" : "module-cli-protocol-unix", NULL); @@ -135,14 +134,14 @@ int main(int argc, char *argv[]) { r = pa_signal_init(pa_mainloop_get_api(mainloop)); assert(r == 0); - pa_signal_register(SIGINT, exit_signal_callback, NULL); + pa_signal_new(SIGINT, exit_signal_callback, NULL); signal(SIGPIPE, SIG_IGN); c = pa_core_new(pa_mainloop_get_api(mainloop)); assert(c); - pa_signal_register(SIGUSR1, aux_signal_callback, c); - pa_signal_register(SIGUSR2, aux_signal_callback, c); + pa_signal_new(SIGUSR1, aux_signal_callback, c); + pa_signal_new(SIGUSR2, aux_signal_callback, c); buf = pa_strbuf_new(); assert(buf); |