From 9c9fe03b8fdafa661e42988a07197ec710f2b18a Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Thu, 3 Jul 2014 14:32:44 +0200 Subject: [PATCH] gnlobject: Allow commiting of object that are not inside a composition Co-Authored by: Mathieu Duponchelle --- gnl/gnlobject.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/gnl/gnlobject.c b/gnl/gnlobject.c index 306f8f1..d3fa85d 100644 --- a/gnl/gnlobject.c +++ b/gnl/gnlobject.c @@ -49,18 +49,12 @@ static GObjectClass *parent_class = NULL; ****************************************************/ #define CHECK_AND_SET(PROPERTY, property, prop_str, print_format) \ { \ -GstObject *parent = gst_object_get_parent (GST_OBJECT (object)); \ -if (parent == NULL && !GNL_OBJECT_IS_COMPOSITION (object)) { \ - GST_INFO_OBJECT (object, "Not in a composition yet, " \ - "not commiting" prop_str); \ -} else if (object->pending_##property != object->property) { \ +if (object->pending_##property != object->property) { \ object->property = object->pending_##property; \ GST_DEBUG_OBJECT(object, "Setting " prop_str " to %" \ print_format, object->property); \ } else \ GST_DEBUG_OBJECT(object, "Nothing to do for " prop_str); \ -if (parent) \ - gst_object_unref (parent); \ } #define SET_PENDING_VALUE(property, property_str, type, print_format) \ -- 2.7.4