Better IR control of lights

[ursary.git] / pulse-ucw.c

diff --git a/pulse-ucw.c b/pulse-ucw.c
index b0581cb57bd2aeb095597f1e7a7ce5ec326471ee..4ef032c36ad0122675e7d2b192c06b9dc22cf026 100644 (file)
--- a/pulse-ucw.c
+++ b/pulse-ucw.c
@@ -13,8 +13,6 @@
 #include <sys/poll.h>
 #include <sys/time.h>
 
-#include <pulse/pulseaudio.h>
-
 #include "ursaryd.h"
 
 struct pmain_io {
@@ -77,7 +75,7 @@ static void pmain_quit(pa_mainloop_api *a, int retval);
 
 static struct main_hook pmain_gc_hook;
 
-static void pmain_trigger_gc(void);
+static void pmain_schedule_gc(void);
 
 struct pa_mainloop_api pmain_api = {
   .io_new = pmain_io_new,
@@ -107,7 +105,7 @@ static struct pmain_io *pmain_get_io(int fd)
        return io;
       }
 
-  struct pmain_io *io = xmalloc(sizeof(*io));
+  struct pmain_io *io = xmalloc_zero(sizeof(*io));
   io->f.fd = fd;
   io->f.data = io;
   clist_add_tail(&pmain_io_list, &io->n);
@@ -189,7 +187,7 @@ static void pmain_io_free(pa_io_event *e)
   DBG("Pulse: Deleting IO %p for fd %d", e, e->io->f.fd);
   pmain_io_enable(e, 0);
   clist_add_tail(&pmain_io_gc_list, &e->gc_n);
-  pmain_trigger_gc();
+  pmain_schedule_gc();
 }
 
 static void pmain_io_set_destroy(pa_io_event *e, pa_io_event_destroy_cb_t cb)
@@ -241,7 +239,7 @@ static void pmain_time_free(pa_time_event *e)
   DBG("Pulse: Timer %p deleted", e);
   timer_del(&e->t);
   clist_add_tail(&pmain_time_gc_list, &e->n);
-  pmain_trigger_gc();
+  pmain_schedule_gc();
 }
 
 static void pmain_time_set_destroy(pa_time_event *e, pa_time_event_destroy_cb_t cb)
@@ -284,7 +282,7 @@ static void pmain_defer_free(pa_defer_event *e)
   DBG("Pulse: Deferred event %p deleted", e);
   hook_del(&e->h);
   clist_add_tail(&pmain_defer_gc_list, &e->n);
-  pmain_trigger_gc();
+  pmain_schedule_gc();
 }
 
 static void pmain_defer_set_destroy(pa_defer_event *e, pa_defer_event_destroy_cb_t cb)
@@ -343,7 +341,7 @@ static int pmain_gc_handler(struct main_hook *h)
   return HOOK_RETRY;
 }
 
-static void pmain_trigger_gc(void)
+static void pmain_schedule_gc(void)
 {
   hook_add(&pmain_gc_hook);
 }