plugins: context now has pa_mainloop_api not pa_mainloop.

diff --git a/src/plugins/bluetooth-client/pulseif.c b/src/plugins/bluetooth-client/pulseif.c
index a797971..57c6a9b 100644 (file)
--- a/src/plugins/bluetooth-client/pulseif.c
+++ b/src/plugins/bluetooth-client/pulseif.c
@@ -59,24 +59,14 @@ static void sink_info_callback(pa_context *, const pa_sink_info *,
                                int, void *);
 
 
-int pulseif_create(context_t *ctx, pa_mainloop *mloop)
+int pulseif_create(context_t *ctx, pa_mainloop_api *pa)
 {
     pulseif_t *pulseif = NULL;
-#if 0
-    pa_mainloop_api *api;
-#endif
 
     if (!(pulseif = mrp_allocz(sizeof(pulseif_t))))
         goto failed;
 
-#if 0
-    api = pa_mainloop_get_api(mloop);
-
-    if (pa_signal_init(api) < 0)
-        goto failed;
-#endif
-
-    pulseif->mloop = mloop;
+    pulseif->paapi = pa;
     pulseif->rate = 16000;
     pulseif->limit.upper = 1500;
     pulseif->limit.lower = 100;
@@ -385,7 +375,7 @@ static void remove_pending_op(pending_op_t *pending)
 static void connect_to_server(context_t *ctx)
 {
     pulseif_t *pulseif = ctx->pulseif;
-    pa_mainloop_api *api = pa_mainloop_get_api(pulseif->mloop);
+    pa_mainloop_api *api = pulseif->paapi;
     pa_context *pactx;
 
     if (pulseif->subscr)

diff --git a/src/plugins/bluetooth-client/pulseif.h b/src/plugins/bluetooth-client/pulseif.h
index 715dc08..6813027 100644 (file)
--- a/src/plugins/bluetooth-client/pulseif.h
+++ b/src/plugins/bluetooth-client/pulseif.h
@@ -8,7 +8,7 @@
 #include "bluetooth-plugin.h"
 
 struct pulseif_s {
-    pa_mainloop *mloop;
+    pa_mainloop_api *paapi;
     pa_context *pactx;
     pa_operation *subscr;
     mrp_list_hook_t cards;
@@ -54,7 +54,7 @@ struct card_s {
 
 
 
-int  pulseif_create(context_t *ctx, pa_mainloop *mloop);
+int  pulseif_create(context_t *ctx, pa_mainloop_api *pa);
 void pulseif_destroy(context_t *ctx);
 
 int pulseif_set_card_profile(card_t *card, const char *profnam);

diff --git a/src/plugins/mpris2-client/clients.c b/src/plugins/mpris2-client/clients.c
index d9d8e86..a80eab3 100644 (file)
--- a/src/plugins/mpris2-client/clients.c
+++ b/src/plugins/mpris2-client/clients.c
@@ -475,7 +475,7 @@ static void schedule_delayed_request(player_t *player)
     
     if (!player || !(ctx = player->ctx) ||
         !(pl = ctx->plugin) || !(srs = pl->srs) ||
-        !(api = pa_mainloop_get_api(srs->pa)))
+        !(api = srs->pa))
         return;
 
     age_of_request = get_current_time() - player->request.time;
@@ -521,7 +521,7 @@ static void player_free(void *key, void *object)
                       (char *)key);
     else {
         if (player->timer && (ctx = player->ctx) && (pl = ctx->plugin) &&
-            (srs = pl->srs) && (api = pa_mainloop_get_api(srs->pa)))
+            (srs = pl->srs) && (api = srs->pa))
         {
             api->time_free(player->timer);
         }