mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-19 20:46:22 +00:00
Code Issues 1 Projects Releases Wiki Activity

composition: No need for action signal to add and remove objects!

Browse source
This commit is contained in:
Thibault Saunier 2014-07-19 11:41:56 +02:00
parent 1c083281f9
commit 1d089e8c80
3 changed files with 18 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
gnl/gnlcomposition.c
View file

@ -69,8 +69,6 @@ enum
{ {
COMMIT_SIGNAL, COMMIT_SIGNAL,
COMMITED_SIGNAL, COMMITED_SIGNAL,
ADD_OBJECT_SIGNAL,
REMOVE_OBJECT_SIGNAL,
LAST_SIGNAL LAST_SIGNAL
}; };
@ -566,17 +564,6 @@ _add_remove_object_gsource (GnlComposition * comp, GnlObject * object)
childio, _free_child_io_data, G_PRIORITY_DEFAULT); childio, _free_child_io_data, G_PRIORITY_DEFAULT);
} }
static gboolean
remove_object_handler (GnlComposition * comp, GnlObject * object)
{
g_return_val_if_fail (GNL_IS_OBJECT (object), FALSE);
object->in_composition = FALSE;
_add_remove_object_gsource (comp, object);
return TRUE;
}
static gboolean static gboolean
_add_object_func (ChildIOData * childio) _add_object_func (ChildIOData * childio)
{ {
@ -621,17 +608,6 @@ _add_add_object_gsource (GnlComposition * comp, GnlObject * object)
_free_child_io_data, G_PRIORITY_DEFAULT); _free_child_io_data, G_PRIORITY_DEFAULT);
} }
static gboolean
add_object_handler (GnlComposition * comp, GnlObject * object)
{
g_return_val_if_fail (GNL_IS_OBJECT (object), FALSE);
object->in_composition = TRUE;
_add_add_object_gsource (comp, object);
return TRUE;
}
static void static void
gnl_composition_class_init (GnlCompositionClass * klass) gnl_composition_class_init (GnlCompositionClass * klass)
{ {
@ -698,22 +674,7 @@ gnl_composition_class_init (GnlCompositionClass * klass)
0, NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, 0, NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1,
G_TYPE_BOOLEAN); G_TYPE_BOOLEAN);
_signals[REMOVE_OBJECT_SIGNAL] =
g_signal_new ("remove-object", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GnlCompositionClass, remove_object_handler), NULL, NULL,
NULL, G_TYPE_BOOLEAN, 1, GNL_TYPE_OBJECT);
_signals[ADD_OBJECT_SIGNAL] =
g_signal_new ("add-object", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GnlCompositionClass, add_object_handler), NULL, NULL,
NULL, G_TYPE_BOOLEAN, 1, GNL_TYPE_OBJECT);
gnlobject_class->commit = gnl_composition_commit_func; gnlobject_class->commit = gnl_composition_commit_func;
klass->remove_object_handler = remove_object_handler;
klass->add_object_handler = add_object_handler;
GST_DEBUG_FUNCPTR (_seek_pipeline_func); GST_DEBUG_FUNCPTR (_seek_pipeline_func);
GST_DEBUG_FUNCPTR (_remove_object_func); GST_DEBUG_FUNCPTR (_remove_object_func);
@ -2728,6 +2689,7 @@ update_pipeline (GnlComposition * comp, GstClockTime currenttime,
static gboolean static gboolean
gnl_composition_add_object (GstBin * bin, GstElement * element) gnl_composition_add_object (GstBin * bin, GstElement * element)
{ {
GnlObject *object;
GnlComposition *comp = (GnlComposition *) bin; GnlComposition *comp = (GnlComposition *) bin;
if (element == comp->priv->current_bin) { if (element == comp->priv->current_bin) {
@ -2735,9 +2697,14 @@ gnl_composition_add_object (GstBin * bin, GstElement * element)
return GST_BIN_CLASS (parent_class)->add_element (bin, element); return GST_BIN_CLASS (parent_class)->add_element (bin, element);
} }
g_assert_not_reached (); g_return_val_if_fail (GNL_IS_OBJECT (element), FALSE);
return FALSE; object = GNL_OBJECT (element);
object->in_composition = TRUE;
_add_add_object_gsource (comp, object);
return TRUE;
} }
static gboolean static gboolean
@ -2828,6 +2795,7 @@ chiringuito:
static gboolean static gboolean
gnl_composition_remove_object (GstBin * bin, GstElement * element) gnl_composition_remove_object (GstBin * bin, GstElement * element)
{ {
GnlObject *object;
GnlComposition *comp = (GnlComposition *) bin; GnlComposition *comp = (GnlComposition *) bin;
if (element == comp->priv->current_bin) { if (element == comp->priv->current_bin) {
@ -2835,9 +2803,14 @@ gnl_composition_remove_object (GstBin * bin, GstElement * element)
return GST_BIN_CLASS (parent_class)->remove_element (bin, element); return GST_BIN_CLASS (parent_class)->remove_element (bin, element);
} }
g_assert_not_reached (); g_return_val_if_fail (GNL_IS_OBJECT (element), FALSE);
return FALSE; object = GNL_OBJECT (element);
object->in_composition = FALSE;
_add_remove_object_gsource (comp, object);
return TRUE;
} }
static gboolean static gboolean

4
gnl/gnlcomposition.h
View file

@ -58,10 +58,6 @@ struct _GnlComposition
struct _GnlCompositionClass struct _GnlCompositionClass
{ {
GnlObjectClass parent_class; GnlObjectClass parent_class;
/* Signal vmethods */
gboolean (*remove_object_handler) (GnlComposition * comp, GnlObject *object);
gboolean (*add_object_handler) (GnlComposition * comp, GnlObject *object);
}; };
GType gnl_composition_get_type (void); GType gnl_composition_get_type (void);

8
tests/check/gnl/common.c
View file

@ -380,7 +380,7 @@ gnl_composition_remove (GstBin * comp, GstElement * object)
{ {
gboolean ret; gboolean ret;
g_signal_emit_by_name (GST_BIN (comp), "remove-object", object, &ret); ret = gst_bin_remove (comp, object);
if (!ret) if (!ret)
return ret; return ret;
@ -392,9 +392,5 @@ gnl_composition_remove (GstBin * comp, GstElement * object)
gboolean gboolean
gnl_composition_add (GstBin * comp, GstElement * object) gnl_composition_add (GstBin * comp, GstElement * object)
{ {
gboolean ret; return gst_bin_add (comp, object);
g_signal_emit_by_name (comp, "add-object", object, &ret);
return ret;
} }