system/pipewire
system/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire synced 2024-10-14 20:02:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to use source_path consistently

Browse source
This commit is contained in:
Wim Taymans 2015-07-09 17:58:54 +02:00
parent 1e4e4ef185
commit f268cdfda6
8 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/introspect.c
View file

@ -34,7 +34,7 @@ fill_info (PinosSourceInfo *info, GDBusProxy *proxy)
info->id = proxy;
info->path = g_dbus_proxy_get_object_path (proxy);
info->source_path = g_dbus_proxy_get_object_path (proxy);
if ((variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "Name"))) {
info->name = g_variant_get_string (variant, NULL);

4
src/client/introspect.h
View file

@ -51,7 +51,7 @@ typedef enum {
/**
* PinosSourceInfo:
* @id: generic id of the source
* @path: the unique path of the source, suitable for connecting
* @source_path: the unique path of the source, suitable for connecting
* @name: name the source, suitable for display
* @properties: the properties of the source
* @state: the current state of the source
@ -61,7 +61,7 @@ typedef enum {
*/
typedef struct {
gpointer id;
const char *path;
const char *source_path;
const char *name;
GVariant *properties;
PinosSourceState state;

16
src/client/stream.c
View file

@ -39,7 +39,7 @@ struct _PinosStreamPrivate
PinosStreamState state;
GError *error;
gchar *target;
gchar *source_path;
GBytes *accepted_formats;
gboolean provide;
@ -226,7 +226,7 @@ pinos_stream_finalize (GObject * object)
if (priv->format)
g_bytes_unref (priv->format);
g_free (priv->target);
g_free (priv->source_path);
if (priv->accepted_formats)
g_bytes_unref (priv->accepted_formats);
@ -530,7 +530,7 @@ do_connect_capture (PinosStream *stream)
g_dbus_proxy_call (context->priv->client,
"CreateSourceOutput",
g_variant_new ("(ss)",
(priv->target ? priv->target : ""),
(priv->source_path ? priv->source_path : ""),
g_bytes_get_data (priv->accepted_formats, NULL)),
G_DBUS_CALL_FLAGS_NONE,
-1,
@ -544,17 +544,17 @@ do_connect_capture (PinosStream *stream)
/**
* pinos_stream_connect_capture:
* @stream: a #PinosStream
* @path: the source path to connect to
* @source_path: the source path to connect to
* @flags: a #PinosStreamFlags
* @spec: a #GVariant
*
* Connect @stream for capturing from @path.
* Connect @stream for capturing from @source_path.
*
* Returns: %TRUE on success.
*/
gboolean
pinos_stream_connect_capture (PinosStream *stream,
const gchar *path,
const gchar *source_path,
PinosStreamFlags flags,
GBytes *accepted_formats)
{
@ -568,8 +568,8 @@ pinos_stream_connect_capture (PinosStream *stream,
context = priv->context;
g_return_val_if_fail (pinos_context_get_state (context) == PINOS_CONTEXT_STATE_READY, FALSE);
g_free (priv->target);
priv->target = g_strdup (path);
g_free (priv->source_path);
priv->source_path = g_strdup (source_path);
if (priv->accepted_formats)
g_bytes_unref (priv->accepted_formats);
priv->accepted_formats = g_bytes_ref (accepted_formats);

2
src/client/stream.h
View file

@ -101,7 +101,7 @@ PinosStreamState pinos_stream_get_state (PinosStream *stream);
const GError * pinos_stream_get_error (PinosStream *stream);
gboolean pinos_stream_connect_capture (PinosStream *stream,
const gchar *path,
const gchar *source_path,
PinosStreamFlags flags,
GBytes *accepted_formats);
gboolean pinos_stream_connect_provide (PinosStream *stream,

2
src/client/subscribe.c
View file

@ -635,7 +635,7 @@ pinos_subscribe_class_init (PinosSubscribeClass * klass)
* @subscribe: The #PinosSubscribe emitting the signal.
* @event: A #PinosSubscriptionEvent
* @flags: #PinosSubscriptionFlags indicating the object
* @path: the object path
* @id: the unique and opaque object id
*
* Notify about a new object that was added/removed/modified.
*/

4
src/gst/gstpinosdeviceprovider.c
View file

@ -88,7 +88,7 @@ gst_pinos_device_create_element (GstDevice * device, const gchar * name)
GstElement *elem;
elem = gst_element_factory_make (pinos_dev->element, name);
g_object_set (elem, "source", pinos_dev->path, NULL);
g_object_set (elem, "path", pinos_dev->path, NULL);
return elem;
}
@ -108,7 +108,7 @@ gst_pinos_device_reconfigure_element (GstDevice * device, GstElement * element)
g_assert_not_reached ();
}
g_object_set (element, "source", pinos_dev->path, NULL);
g_object_set (element, "path", pinos_dev->path, NULL);
return TRUE;
}

24
src/gst/gstpinossrc.c
View file

@ -50,7 +50,7 @@ GST_DEBUG_CATEGORY_STATIC (pinos_src_debug);
enum
{
PROP_0,
PROP_SOURCE
PROP_PATH
};
@ -87,9 +87,9 @@ gst_pinos_src_set_property (GObject * object, guint prop_id,
GstPinosSrc *pinossrc = GST_PINOS_SRC (object);
switch (prop_id) {
case PROP_SOURCE:
g_free (pinossrc->source);
pinossrc->source = g_value_dup_string (value);
case PROP_PATH:
g_free (pinossrc->path);
pinossrc->path = g_value_dup_string (value);
break;
default:
@ -105,8 +105,8 @@ gst_pinos_src_get_property (GObject * object, guint prop_id,
GstPinosSrc *pinossrc = GST_PINOS_SRC (object);
switch (prop_id) {
case PROP_SOURCE:
g_value_set_string (value, pinossrc->source);
case PROP_PATH:
g_value_set_string (value, pinossrc->path);
break;
default:
@ -121,7 +121,7 @@ gst_pinos_src_finalize (GObject * object)
GstPinosSrc *pinossrc = GST_PINOS_SRC (object);
g_object_unref (pinossrc->fd_allocator);
g_free (pinossrc->source);
g_free (pinossrc->path);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@ -144,10 +144,10 @@ gst_pinos_src_class_init (GstPinosSrcClass * klass)
gobject_class->get_property = gst_pinos_src_get_property;
g_object_class_install_property (gobject_class,
PROP_SOURCE,
g_param_spec_string ("source",
"Source",
"The source name to connect to (NULL = default)",
PROP_PATH,
g_param_spec_string ("path",
"Path",
"The source path to connect to (NULL = default)",
NULL,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
@ -304,7 +304,7 @@ gst_pinos_src_negotiate (GstBaseSrc * basesrc)
accepted = g_bytes_new_take (str, strlen (str) + 1);
pinos_main_loop_lock (pinossrc->loop);
pinos_stream_connect_capture (pinossrc->stream, pinossrc->source, 0, accepted);
pinos_stream_connect_capture (pinossrc->stream, pinossrc->path, 0, accepted);
while (TRUE) {
PinosStreamState state = pinos_stream_get_state (pinossrc->stream);

2
src/gst/gstpinossrc.h
View file

@ -52,7 +52,7 @@ struct _GstPinosSrc {
GstPushSrc element;
/*< private >*/
gchar *source;
gchar *path;
gboolean negotiated;