diff options
Diffstat (limited to 'src/modules/dbus-util.c')
| -rw-r--r-- | src/modules/dbus-util.c | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/src/modules/dbus-util.c b/src/modules/dbus-util.c index ccc658b7..905be13f 100644 --- a/src/modules/dbus-util.c +++ b/src/modules/dbus-util.c @@ -1,5 +1,3 @@ -/* $Id$ */ - /*** This file is part of PulseAudio. @@ -35,7 +33,7 @@ struct pa_dbus_connection { PA_REFCNT_DECLARE; - + pa_core *core; DBusConnection *connection; const char *property_name; @@ -44,7 +42,7 @@ struct pa_dbus_connection { static void dispatch_cb(pa_mainloop_api *ea, pa_defer_event *ev, void *userdata) { DBusConnection *conn = userdata; - + if (dbus_connection_dispatch(conn) == DBUS_DISPATCH_COMPLETE) { /* no more data to process, disable the deferred */ ea->defer_enable(ev, 0); @@ -56,13 +54,13 @@ static void dispatch_status(DBusConnection *conn, DBusDispatchStatus status, voi pa_dbus_connection *c = userdata; pa_assert(c); - + switch(status) { - + case DBUS_DISPATCH_COMPLETE: c->core->mainloop->defer_enable(c->dispatch_event, 0); break; - + case DBUS_DISPATCH_DATA_REMAINS: case DBUS_DISPATCH_NEED_MEMORY: default: @@ -76,9 +74,9 @@ static pa_io_event_flags_t get_watch_flags(DBusWatch *watch) { pa_io_event_flags_t events = 0; pa_assert(watch); - + flags = dbus_watch_get_flags(watch); - + /* no watch flags for disabled watches */ if (!dbus_watch_get_enabled(watch)) return PA_IO_EVENT_NULL; @@ -142,14 +140,14 @@ static dbus_bool_t add_watch(DBusWatch *watch, void *data) { pa_assert(c); ev = c->mainloop->io_new( - c->mainloop, + c->mainloop, #if HAVE_DBUS_WATCH_GET_UNIX_FD - dbus_watch_get_unix_fd(watch), + dbus_watch_get_unix_fd(watch), #else - dbus_watch_get_fd(watch), + dbus_watch_get_fd(watch), #endif get_watch_flags(watch), handle_io_event, watch); - + dbus_watch_set_data(watch, ev, NULL); return TRUE; @@ -162,7 +160,7 @@ static void remove_watch(DBusWatch *watch, void *data) { pa_assert(watch); pa_assert(c); - + if ((ev = dbus_watch_get_data(watch))) c->mainloop->io_free(ev); } @@ -174,7 +172,7 @@ static void toggle_watch(DBusWatch *watch, void *data) { pa_assert(watch); pa_core_assert_ref(c); - + pa_assert_se(ev = dbus_watch_get_data(watch)); /* get_watch_flags() checks if the watch is enabled */ @@ -210,7 +208,7 @@ static void remove_timeout(DBusTimeout *timeout, void *data) { pa_assert(timeout); pa_assert(c); - + if ((ev = dbus_timeout_get_data(timeout))) c->mainloop->time_free(ev); } @@ -222,15 +220,15 @@ static void toggle_timeout(DBusTimeout *timeout, void *data) { pa_assert(timeout); pa_assert(c); - + pa_assert_se(ev = dbus_timeout_get_data(timeout)); if (dbus_timeout_get_enabled(timeout)) { struct timeval tv; - + pa_gettimeofday(&tv); pa_timeval_add(&tv, dbus_timeout_get_interval(timeout) * 1000); - + c->mainloop->time_restart(ev, &tv); } else c->mainloop->time_restart(ev, NULL); @@ -240,7 +238,7 @@ static void wakeup_main(void *userdata) { pa_dbus_connection *c = userdata; pa_assert(c); - + /* this will wakeup the mainloop and dispatch events, although * it may not be the cleanest way of accomplishing it */ c->core->mainloop->defer_enable(c->dispatch_event, 1); @@ -265,7 +263,7 @@ DBusConnection* pa_dbus_connection_get(pa_dbus_connection *c){ pa_assert(c); pa_assert(PA_REFCNT_VALUE(c) > 0); pa_assert(c->connection); - + return c->connection; } @@ -282,7 +280,7 @@ void pa_dbus_connection_unref(pa_dbus_connection *c) { * both unload and shutdown */ while (dbus_connection_read_write_dispatch(c->connection, -1)); } - + /* already disconnected, just free */ pa_property_remove(c->core, c->property_name); c->core->mainloop->defer_free(c->dispatch_event); @@ -300,7 +298,7 @@ pa_dbus_connection* pa_dbus_connection_ref(pa_dbus_connection *c) { } pa_dbus_connection* pa_dbus_bus_get(pa_core *c, DBusBusType type, DBusError *error) { - + static const char *const prop_name[] = { [DBUS_BUS_SESSION] = "dbus-connection-session", [DBUS_BUS_SYSTEM] = "dbus-connection-system", |