mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

add get_proxy_finish

Browse source 
Fix some compilation issues
This commit is contained in:
Wim Taymans 2015-05-04 12:16:30 +02:00
parent 0a9f79b675
commit 1b89f2f8ad
6 changed files with 47 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/client/pv-subscribe.c
View file

@ -115,9 +115,9 @@ on_proxy_properties_changed (GDBusProxy *proxy,
GStrv invalidated_properties,
gpointer user_data)
{
ProxyData *data = user_data;
PvObjectData *data = user_data;
notify_event (subscribe, data->proxy, PV_SUBSCRIPTION_EVENT_CHANGE);
notify_event (data->subscribe, data, PV_SUBSCRIPTION_EVENT_CHANGE);
}
static void
@ -125,12 +125,14 @@ on_proxy_created (GObject *source_object,
GAsyncResult *res,
gpointer user_data)
{
ProxyData *data = user_data;
PvObjectData *data = user_data;
PvSubscribe *subscribe = data->subscribe;
PvSubscribePrivate *priv = subscribe->priv;
GError *error = NULL;
GList *walk;
data->pending = FALSE;
data->proxy = g_dbus_proxy_new_finish (res, &error);
if (data->proxy == NULL) {
priv->objects = g_list_remove (priv->objects, data);
@ -166,13 +168,14 @@ add_interface (PvSubscribe *subscribe,
GVariant *properties)
{
PvSubscribePrivate *priv = subscribe->priv;
ProxyData *data;
PvObjectData *data;
data = g_new0 (ProxyData, 1);
data = g_new0 (PvObjectData, 1);
data->subscribe = subscribe;
data->sender_name = g_strdup (priv->service);
data->object_path = g_strdup (object_path);
data->interface_name = g_strdup (interface_name);
data->pending = TRUE;
priv->objects = g_list_prepend (priv->objects, data);
priv->pending_proxies++;
@ -647,8 +650,6 @@ compare_data (PvObjectData *data, const gchar *name,
void
pv_subscribe_get_proxy (PvSubscribe *subscribe,
GDBusProxyFlags flags,
GDBusInterfaceInfo *info,
const gchar *name,
const gchar *object_path,
const gchar *interface_name,
@ -657,10 +658,9 @@ pv_subscribe_get_proxy (PvSubscribe *subscribe,
gpointer user_data)
{
PvSubscribePrivate *priv;
GDBusProxy *res = NULL;
GList *walk;
g_return_val_if_fail (PV_IS_SUBSCRIBE (subscribe), NULL);
g_return_if_fail (PV_IS_SUBSCRIBE (subscribe));
priv = subscribe->priv;
for (walk = priv->objects; walk; walk = g_list_next (walk)) {
@ -675,7 +675,6 @@ pv_subscribe_get_proxy (PvSubscribe *subscribe,
user_data);
if (data->pending) {
g_task_set_task_data (task, data, NULL);
data->tasks = g_list_prepend (data->tasks, task);
} else if (data->proxy) {
g_task_return_pointer (task, g_object_ref (data->proxy), g_object_unref);
@ -687,3 +686,11 @@ pv_subscribe_get_proxy (PvSubscribe *subscribe,
}
}
GDBusProxy *
pv_subscribe_get_proxy_finish (PvSubscribe *subscribe,
GAsyncResult *res,
GError **error)
{
return g_task_propagate_pointer (G_TASK (res), error);
}