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

Move CreateSourceOutput to client object

Browse source 
Move the CreateSourceOutput method back to the client object so that we
can leave the selection of the source in the server.
This commit is contained in:
Wim Taymans 2015-05-11 16:08:34 +02:00
parent d9444ab360
commit 7bb3ae2562
10 changed files with 124 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/client/pv-context.c
View file

@ -614,18 +614,3 @@ pv_context_get_error (PvContext *context)
return priv->error;
}
GDBusProxy *
pv_context_find_source (PvContext *context, const gchar *name, GVariant *props)
{
PvContextPrivate *priv;
g_return_val_if_fail (PV_IS_CONTEXT (context), NULL);
priv = context->priv;
if (priv->sources == NULL)
return NULL;
return priv->sources->data;
}

3
src/client/pv-private.h
View file

@ -44,6 +44,3 @@ struct _PvContextPrivate
GDBusObjectManagerServer *server_manager;
};
GDBusProxy * pv_context_find_source (PvContext *context, const gchar *name, GVariant *props);

18
src/client/pv-stream.c
View file

@ -37,7 +37,6 @@ struct _PvStreamPrivate
GError *error;
gchar *source_output_path;
GDBusProxy *source;
GVariant *spec;
GDBusProxy *source_output;
@ -380,7 +379,7 @@ on_source_output_created (GObject *source_object,
g_assert (g_main_context_get_thread_default () == priv->context->priv->context);
ret = g_dbus_proxy_call_finish (priv->source, res, &error);
ret = g_dbus_proxy_call_finish (context->priv->client, res, &error);
if (ret == NULL)
goto create_failed;
@ -412,12 +411,15 @@ static gboolean
do_connect_capture (PvStream *stream)
{
PvStreamPrivate *priv = stream->priv;
PvContext *context = priv->context;
g_assert (g_main_context_get_thread_default () == priv->context->priv->context);
g_dbus_proxy_call (priv->source,
g_dbus_proxy_call (context->priv->client,
"CreateSourceOutput",
g_variant_new ("(@a{sv})", priv->spec),
g_variant_new ("(o@a{sv})",
(priv->target ? priv->target : "/"),
priv->spec),
G_DBUS_CALL_FLAGS_NONE,
-1,
NULL, /* GCancellable *cancellable */
@ -454,12 +456,6 @@ pv_stream_connect_capture (PvStream *stream,
g_return_val_if_fail (pv_context_get_state (context) == PV_CONTEXT_STATE_READY, FALSE);
priv->target = g_strdup (source);
priv->source = pv_context_find_source (context, priv->target, NULL);
if (priv->source == NULL) {
g_warning ("can't find source");
return FALSE;
}
priv->spec = spec;
stream_set_state (stream, PV_STREAM_STATE_CONNECTING);
@ -481,7 +477,7 @@ on_source_output_removed (GObject *source_object,
g_assert (g_main_context_get_thread_default () == priv->context->priv->context);
ret = g_dbus_proxy_call_finish (priv->source, res, &error);
ret = g_dbus_proxy_call_finish (priv->source_output, res, &error);
if (ret == NULL) {
priv->error = error;
stream_set_state (stream, PV_STREAM_STATE_ERROR);

5
src/client/pv-stream.h
View file

@ -104,6 +104,9 @@ gboolean pv_stream_connect_capture (PvStream *stream,
const gchar *source,
PvStreamFlags flags,
GVariant *spec);
gboolean pv_stream_connect_provide (PvStream *stream,
PvStreamFlags flags,
GVariant *spec);
gboolean pv_stream_disconnect (PvStream *stream);
gboolean pv_stream_start (PvStream *stream, PvStreamMode mode);
@ -111,6 +114,8 @@ gboolean pv_stream_stop (PvStream *stream);
gboolean pv_stream_capture_buffer (PvStream *stream,
PvBufferInfo *info);
gboolean pv_stream_provide_buffer (PvStream *stream,
PvBufferInfo *info);
G_END_DECLS