capabilities -> formats

This commit is contained in:
Wim Taymans 2015-05-15 16:41:53 +02:00
parent 31cc37b6a5
commit d531634061
6 changed files with 40 additions and 29 deletions

View file

@ -139,7 +139,7 @@ client_set_state (PvSource *source, PvSourceState state)
}
static GBytes *
client_get_capabilities (PvSource *source, GBytes *filter)
client_get_formats (PvSource *source, GBytes *filter)
{
GstCaps *caps, *cfilter;
gchar *str;
@ -311,7 +311,7 @@ pv_client_source_class_init (PvClientSourceClass * klass)
gobject_class->finalize = client_source_finalize;
source_class->get_capabilities = client_get_capabilities;
source_class->get_formats = client_get_formats;
source_class->set_state = client_set_state;
source_class->create_source_output = client_create_source_output;
source_class->release_source_output = client_release_source_output;

View file

@ -187,11 +187,19 @@ pv_source_finalize (GObject * object)
G_OBJECT_CLASS (pv_source_parent_class)->finalize (object);
}
static gboolean
default_set_state (PvSource *source, PvSourceState state)
{
pv_source_update_state (source, state);
return TRUE;
}
static PvSourceOutput *
default_create_source_output (PvSource *source,
default_create_source_output (PvSource *source,
const gchar *client_path,
GBytes *format_filter,
const gchar *prefix)
GBytes *format_filter,
const gchar *prefix,
GError **error)
{
PvSourcePrivate *priv = source->priv;
@ -272,6 +280,7 @@ pv_source_class_init (PvSourceClass * klass)
G_PARAM_STATIC_STRINGS));
klass->set_state = default_set_state;
klass->create_source_output = default_create_source_output;
klass->release_source_output = default_release_source_output;
}
@ -283,7 +292,7 @@ pv_source_init (PvSource * source)
}
GBytes *
pv_source_get_capabilities (PvSource *source, GBytes *filter)
pv_source_get_formats (PvSource *source, GBytes *filter)
{
PvSourceClass *klass;
GBytes *res;
@ -292,8 +301,8 @@ pv_source_get_capabilities (PvSource *source, GBytes *filter)
klass = PV_SOURCE_GET_CLASS (source);
if (klass->get_capabilities)
res = klass->get_capabilities (source, filter);
if (klass->get_formats)
res = klass->get_formats (source, filter);
else
res = NULL;
@ -329,8 +338,7 @@ pv_source_update_state (PvSource *source, PvSourceState state)
if (priv->state != state) {
priv->state = state;
g_print ("source changed state %d\n", state);
if (priv->iface)
pv_source1_set_state (priv->iface, state);
pv_source1_set_state (priv->iface, state);
g_object_notify (G_OBJECT (source), "state");
}
}

View file

@ -54,7 +54,7 @@ struct _PvSource {
/**
* PvSourceClass:
* @get_capabilities: called to get a list of supported formats from the source
* @get_formats: called to get a list of supported formats from the source
* @set_state: called to change the current state of the source
* @create_source_output: called to create a new source-output object
* @release_source_output: called to release a source-output object
@ -64,7 +64,7 @@ struct _PvSource {
struct _PvSourceClass {
GObjectClass parent_class;
GBytes * (*get_capabilities) (PvSource *source, GBytes *filter);
GBytes * (*get_formats) (PvSource *source, GBytes *filter);
gboolean (*set_state) (PvSource *source, PvSourceState);
@ -82,7 +82,7 @@ GType pv_source_get_type (void);
const gchar * pv_source_get_object_path (PvSource *source);
GBytes * pv_source_get_capabilities (PvSource *source, GBytes *filter);
GBytes * pv_source_get_formats (PvSource *source, GBytes *filter);
gboolean pv_source_set_state (PvSource *source, PvSourceState state);
void pv_source_update_state (PvSource *source, PvSourceState state);