mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 19:51:11 +00:00
More cleanups and refcount fixage
Original commit message from CVS: More cleanups and refcount fixage
This commit is contained in:
parent
06fe035ae4
commit
eadfe716a0
3 changed files with 7 additions and 11 deletions
|
@ -123,10 +123,7 @@ gst_pipeline_dispose (GObject *object)
|
||||||
|
|
||||||
G_OBJECT_CLASS (parent_class)->dispose (object);
|
G_OBJECT_CLASS (parent_class)->dispose (object);
|
||||||
|
|
||||||
if (GST_ELEMENT_SCHED (pipeline)) {
|
gst_object_swap ((GstObject **)&GST_ELEMENT_SCHED (pipeline), NULL);
|
||||||
gst_object_unref (GST_OBJECT (GST_ELEMENT_SCHED (pipeline)));
|
|
||||||
GST_ELEMENT_SCHED (pipeline) = NULL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -807,7 +807,7 @@ gst_scheduler_factory_new (const gchar *name, const gchar *longdesc, GType type)
|
||||||
{
|
{
|
||||||
GstSchedulerFactory *factory;
|
GstSchedulerFactory *factory;
|
||||||
|
|
||||||
g_return_val_if_fail(name != NULL, NULL);
|
g_return_val_if_fail (name != NULL, NULL);
|
||||||
|
|
||||||
factory = gst_scheduler_factory_find (name);
|
factory = gst_scheduler_factory_find (name);
|
||||||
|
|
||||||
|
@ -851,7 +851,7 @@ gst_scheduler_factory_find (const gchar *name)
|
||||||
{
|
{
|
||||||
GstPluginFeature *feature;
|
GstPluginFeature *feature;
|
||||||
|
|
||||||
g_return_val_if_fail(name != NULL, NULL);
|
g_return_val_if_fail (name != NULL, NULL);
|
||||||
|
|
||||||
GST_DEBUG (0,"gstscheduler: find \"%s\"", name);
|
GST_DEBUG (0,"gstscheduler: find \"%s\"", name);
|
||||||
|
|
||||||
|
@ -880,7 +880,8 @@ gst_scheduler_factory_create (GstSchedulerFactory *factory, GstElement *parent)
|
||||||
GstScheduler *new = NULL;
|
GstScheduler *new = NULL;
|
||||||
|
|
||||||
g_return_val_if_fail (factory != NULL, NULL);
|
g_return_val_if_fail (factory != NULL, NULL);
|
||||||
g_return_val_if_fail (parent != NULL, NULL);
|
g_return_val_if_fail (GST_IS_ELEMENT (parent), NULL);
|
||||||
|
g_return_val_if_fail (GST_ELEMENT_SCHED (parent) == NULL, NULL);
|
||||||
|
|
||||||
if (gst_plugin_feature_ensure_loaded (GST_PLUGIN_FEATURE (factory))) {
|
if (gst_plugin_feature_ensure_loaded (GST_PLUGIN_FEATURE (factory))) {
|
||||||
g_return_val_if_fail (factory->type != 0, NULL);
|
g_return_val_if_fail (factory->type != 0, NULL);
|
||||||
|
|
|
@ -209,11 +209,9 @@ gst_thread_dispose (GObject *object)
|
||||||
g_cond_free (thread->cond_t);
|
g_cond_free (thread->cond_t);
|
||||||
g_cond_free (thread->cond_m);
|
g_cond_free (thread->cond_m);
|
||||||
|
|
||||||
G_OBJECT_CLASS (parent_class)->dispose (object);
|
gst_object_swap ((GstObject **)&GST_ELEMENT_SCHED (thread), NULL);
|
||||||
|
|
||||||
if (GST_ELEMENT_SCHED (thread)) {
|
G_OBJECT_CLASS (parent_class)->dispose (object);
|
||||||
gst_object_unref (GST_OBJECT (GST_ELEMENT_SCHED (thread)));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue