build fixes

[pulseaudio] / polyp / main.c

diff --git a/polyp/main.c b/polyp/main.c
index d9967cef2c6b376e7988d349523e61458046690a..de02a110f66d3f12f4cf939701a8939cc9dfbfc9 100644 (file)
--- a/polyp/main.c
+++ b/polyp/main.c
@@ -42,16 +42,16 @@
 #include "cli-command.h"
 #include "util.h"
 #include "sioman.h"
+#include "xmalloc.h"
 
 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);
@@ -125,26 +125,29 @@ int main(int argc, char *argv[]) {
     
     r = lt_dlinit();
     assert(r == 0);
-    
+#ifdef DLSEARCHDIR
+    lt_dladdsearchdir(DLSEARCHDIR);
+#endif
+
     mainloop = pa_mainloop_new();
     assert(mainloop);
 
     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);
     r = pa_cli_command_execute(c, cmdline->cli_commands, buf, &cmdline->fail, &cmdline->verbose);
     fprintf(stderr, s = pa_strbuf_tostring_free(buf));
-    free(s);
+    pa_xfree(s);
     
     if (r < 0 && cmdline->fail) {
         fprintf(stderr, __FILE__": failed to initialize daemon.\n");