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

source: add GError to get_formats

Browse source 
Add GError to get_formats to get more error information.
Update the source possible formats when source-output is active
This commit is contained in:
Wim Taymans 2015-08-11 16:02:21 +02:00
parent 0378dcd4b7
commit 7cf87d902e
4 changed files with 109 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/server/client-source.c
View file

@ -199,7 +199,8 @@ client_set_state (PinosSource *source,
static GBytes *
client_get_formats (PinosSource *source,
GBytes *filter)
GBytes *filter,
GError **error)
{
GstCaps *caps, *cfilter;
gchar *str;
@ -207,18 +208,35 @@ client_get_formats (PinosSource *source,
if (filter) {
cfilter = gst_caps_from_string (g_bytes_get_data (filter, NULL));
if (cfilter == NULL)
return NULL;
goto invalid_filter;
} else {
cfilter = NULL;
}
caps = collect_caps (source, cfilter);
if (caps == NULL)
return NULL;
goto no_format;
str = gst_caps_to_string (caps);
return g_bytes_new_take (str, strlen (str) + 1);
invalid_filter:
{
if (error)
*error = g_error_new (G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
"Invalid filter received");
return NULL;
}
no_format:
{
if (error)
*error = g_error_new (G_IO_ERROR,
G_IO_ERROR_NOT_FOUND,
"No compatible format found");
return NULL;
}
}
static void

43
src/server/source.c
View file

@ -123,6 +123,11 @@ pinos_source_set_property (GObject *_object,
if (priv->properties)
pinos_properties_free (priv->properties);
priv->properties = g_value_dup_boxed (value);
if (priv->iface)
g_object_set (priv->iface,
"properties", priv->properties ?
pinos_properties_to_variant (priv->properties) : NULL,
NULL);
break;
default:
@ -140,7 +145,7 @@ source_register_object (PinosSource *source)
GBytes *formats;
GVariant *variant;
formats = pinos_source_get_formats (source, NULL);
formats = pinos_source_get_formats (source, NULL, NULL);
skel = pinos_object_skeleton_new (PINOS_DBUS_OBJECT_SOURCE);
@ -245,14 +250,23 @@ default_create_source_output (PinosSource *source,
{
PinosSourcePrivate *priv = source->priv;
PinosSourceOutput *output;
GBytes *possible_formats;
possible_formats = pinos_source_get_formats (source, format_filter, error);
if (possible_formats == NULL)
return NULL;
output = g_object_new (PINOS_TYPE_SOURCE_OUTPUT, "daemon", priv->daemon,
"object-path", prefix,
"client-path", client_path,
"source-path", priv->object_path,
"possible-formats", format_filter,
"possible-formats", possible_formats,
"properties", props,
NULL);
g_bytes_unref (possible_formats);
if (output == NULL)
goto no_output;
g_signal_connect (output,
"remove",
@ -262,6 +276,16 @@ default_create_source_output (PinosSource *source,
priv->outputs = g_list_prepend (priv->outputs, output);
return g_object_ref (output);
/* ERRORS */
no_output:
{
if (error)
*error = g_error_new (G_IO_ERROR,
G_IO_ERROR_FAILED,
"Could not create a source output");
return NULL;
}
}
static gboolean
@ -359,8 +383,9 @@ pinos_source_init (PinosSource * source)
}
GBytes *
pinos_source_get_formats (PinosSource *source,
GBytes *filter)
pinos_source_get_formats (PinosSource *source,
GBytes *filter,
GError **error)
{
PinosSourceClass *klass;
GBytes *res;
@ -370,10 +395,14 @@ pinos_source_get_formats (PinosSource *source,
klass = PINOS_SOURCE_GET_CLASS (source);
if (klass->get_formats)
res = klass->get_formats (source, filter);
else
res = klass->get_formats (source, filter, error);
else {
res = NULL;
if (error)
*error = g_error_new (G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED,
"Format query is not supported");
}
return res;
}

8
src/server/source.h
View file

@ -64,7 +64,9 @@ struct _PinosSource {
struct _PinosSourceClass {
GObjectClass parent_class;
GBytes * (*get_formats) (PinosSource *source, GBytes *filter);
GBytes * (*get_formats) (PinosSource *source,
GBytes *filter,
GError **error);
gboolean (*set_state) (PinosSource *source, PinosSourceState);
@ -83,7 +85,9 @@ GType pinos_source_get_type (void);
const gchar * pinos_source_get_object_path (PinosSource *source);
GBytes * pinos_source_get_formats (PinosSource *source, GBytes *filter);
GBytes * pinos_source_get_formats (PinosSource *source,
GBytes *filter,
GError **error);
gboolean pinos_source_set_state (PinosSource *source, PinosSourceState state);
void pinos_source_update_state (PinosSource *source, PinosSourceState state);