Revert "use time_new rather than defer_new for delayed callbacks"

This reverts commit b3f2a8e.
i-rinat · Mar 15, 2018 · 0008b1d · 0008b1d
1 parent 3ab1f47
commit 0008b1d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/src/apulse-context.c b/src/apulse-context.c
@@ -45,8 +45,8 @@ pai_context_set_state(pa_context *c, pa_context_state_t new_state)
 }
 
 static void
-pai_context_state_changed(pa_mainloop_api *api, pa_time_event *e,
-                          const struct timeval *tv, void *userdata)
+pai_context_state_changed(pa_mainloop_api *api, pa_defer_event *de,
+                          void *userdata)
 {
     pa_context *c = userdata;
     pai_context_set_state(c, c->new_state);
@@ -64,8 +64,7 @@ pa_context_connect(pa_context *c, const char *server, pa_context_flags_t flags,
     pa_context_ref(c);
     pai_context_set_state(c, PA_CONTEXT_CONNECTING);
     c->new_state = PA_CONTEXT_READY;
-    c->mainloop_api->time_new(c->mainloop_api, &(struct timeval){},
-                              pai_context_state_changed, c);
+    c->mainloop_api->defer_new(c->mainloop_api, pai_context_state_changed, c);
 
     return 0;
 }

diff --git a/src/apulse-operation.c b/src/apulse-operation.c
@@ -26,8 +26,7 @@
 #include "trace.h"
 
 static void
-deh_perform_operation(pa_mainloop_api *api, pa_time_event *e,
-                      const struct timeval *tv, void *userdata)
+deh_perform_operation(pa_mainloop_api *api, pa_defer_event *de, void *userdata)
 {
     pa_operation *op = userdata;
     op->handler(op);
@@ -49,8 +48,7 @@ void
 pa_operation_launch(pa_operation *op)
 {
     pa_mainloop_api *api = op->api;
-    api->time_new(api, &(struct timeval){}, deh_perform_operation,
-                  pa_operation_ref(op));
+    api->defer_new(api, deh_perform_operation, pa_operation_ref(op));
 }
 
 void

diff --git a/src/apulse-stream.c b/src/apulse-stream.c
@@ -31,8 +31,8 @@
 #define HAVE_SND_PCM_AVAIL SND_LIB_VERSION >= MAKE_SND_LIB_VERSION(1, 0, 18)
 
 static void
-deh_stream_state_changed(pa_mainloop_api *api, pa_time_event *e,
-                         const struct timeval *tv, void *userdata)
+deh_stream_state_changed(pa_mainloop_api *api, pa_defer_event *de,
+                         void *userdata)
 {
     pa_stream *s = userdata;
     if (s->state_cb)
@@ -41,8 +41,8 @@ deh_stream_state_changed(pa_mainloop_api *api, pa_time_event *e,
 }
 
 static void
-deh_stream_first_readwrite_callback(pa_mainloop_api *api, pa_time_event *e,
-                                    const struct timeval *tv, void *userdata)
+deh_stream_first_readwrite_callback(pa_mainloop_api *api, pa_defer_event *de,
+                                    void *userdata)
 {
     pa_stream *s = userdata;
 
@@ -448,11 +448,11 @@ do_connect_pcm(pa_stream *s, snd_pcm_stream_t stream_direction)
 
     s->state = PA_STREAM_READY;
     pa_stream_ref(s);
-    s->c->mainloop_api->time_new(s->c->mainloop_api, &(struct timeval){},
-                                 deh_stream_state_changed, s);
+    s->c->mainloop_api->defer_new(s->c->mainloop_api, deh_stream_state_changed,
+                                  s);
     pa_stream_ref(s);
-    s->c->mainloop_api->time_new(s->c->mainloop_api, &(struct timeval){},
-                                 deh_stream_first_readwrite_callback, s);
+    s->c->mainloop_api->defer_new(s->c->mainloop_api,
+                                  deh_stream_first_readwrite_callback, s);
 
     g_free(device_description);
     return 0;