summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Kost <ensonic@users.sourceforge.net>2006-04-08 20:57:31 +0000
committerStefan Kost <ensonic@users.sourceforge.net>2006-04-08 20:57:31 +0000
commit77a56957181542ebd67bb5777903b37987bb2036 (patch)
tree0c8a24c049cb3cb794c15607e7a9e218ef7cdc76
parented95eff8a1cf986e9a2c58119f8a4b30627cb2b1 (diff)
Fix #337365 (g_type_class_ref <-> g_type_class_peek_parent)
Original commit message from CVS: * gst/gstbuffer.c: (gst_subbuffer_class_init): * gst/gstclock.c: (gst_clock_class_init): * gst/gstelement.c: (gst_element_class_init): * gst/gstindex.c: (gst_index_class_init): * gst/gstindexfactory.c: (gst_index_factory_class_init): * gst/gstobject.c: (gst_object_class_init), (gst_signal_object_class_init): * gst/gstpad.c: (gst_pad_class_init): * gst/gstpadtemplate.c: (gst_pad_template_class_init): * gst/gstpluginfeature.c: (gst_plugin_feature_class_init): * gst/gstregistry.c: (gst_registry_class_init): * gst/gstsystemclock.c: (gst_system_clock_class_init): * gst/gsttask.c: (gst_task_class_init): * gst/gstxml.c: (gst_xml_class_init): * libs/gst/base/gstbasesink.c: (gst_base_sink_class_init): * libs/gst/base/gstbasesrc.c: (gst_base_src_class_init), (gst_base_src_loop): * libs/gst/controller/gstcontroller.c: (_gst_controller_class_init): * plugins/elements/gstfdsrc.c: (gst_fd_src_class_init): * plugins/indexers/gstfileindex.c: (gst_file_index_class_init): * plugins/indexers/gstmemindex.c: (gst_mem_index_class_init): * tests/old/examples/plugins/example.c: (gst_example_class_init): * tests/old/testsuite/threads/signals.c: (gst_test_class_init): Fix #337365 (g_type_class_ref <-> g_type_class_peek_parent)
-rw-r--r--ChangeLog28
-rw-r--r--gst/gstbuffer.c2
-rw-r--r--gst/gstclock.c2
-rw-r--r--gst/gstelement.c2
-rw-r--r--gst/gstindex.c2
-rw-r--r--gst/gstindexfactory.c2
-rw-r--r--gst/gstobject.c5
-rw-r--r--gst/gstpad.c6
-rw-r--r--gst/gstpadtemplate.c2
-rw-r--r--gst/gstpluginfeature.c2
-rw-r--r--gst/gstregistry.c2
-rw-r--r--gst/gstsystemclock.c2
-rw-r--r--gst/gsttask.c2
-rw-r--r--gst/gstxml.c2
-rw-r--r--libs/gst/base/gstbasesink.c2
-rw-r--r--libs/gst/base/gstbasesrc.c11
-rw-r--r--libs/gst/controller/gstcontroller.c2
-rw-r--r--plugins/elements/gstfdsrc.c2
-rw-r--r--plugins/indexers/gstfileindex.c2
-rw-r--r--plugins/indexers/gstmemindex.c2
-rw-r--r--tests/old/examples/plugins/example.c2
-rw-r--r--tests/old/testsuite/threads/signals.c2
22 files changed, 60 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index aafedb995..366253fd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2006-04-08 Stefan Kost <ensonic@users.sf.net>
+
+ * gst/gstbuffer.c: (gst_subbuffer_class_init):
+ * gst/gstclock.c: (gst_clock_class_init):
+ * gst/gstelement.c: (gst_element_class_init):
+ * gst/gstindex.c: (gst_index_class_init):
+ * gst/gstindexfactory.c: (gst_index_factory_class_init):
+ * gst/gstobject.c: (gst_object_class_init),
+ (gst_signal_object_class_init):
+ * gst/gstpad.c: (gst_pad_class_init):
+ * gst/gstpadtemplate.c: (gst_pad_template_class_init):
+ * gst/gstpluginfeature.c: (gst_plugin_feature_class_init):
+ * gst/gstregistry.c: (gst_registry_class_init):
+ * gst/gstsystemclock.c: (gst_system_clock_class_init):
+ * gst/gsttask.c: (gst_task_class_init):
+ * gst/gstxml.c: (gst_xml_class_init):
+ * libs/gst/base/gstbasesink.c: (gst_base_sink_class_init):
+ * libs/gst/base/gstbasesrc.c: (gst_base_src_class_init),
+ (gst_base_src_loop):
+ * libs/gst/controller/gstcontroller.c:
+ (_gst_controller_class_init):
+ * plugins/elements/gstfdsrc.c: (gst_fd_src_class_init):
+ * plugins/indexers/gstfileindex.c: (gst_file_index_class_init):
+ * plugins/indexers/gstmemindex.c: (gst_mem_index_class_init):
+ * tests/old/examples/plugins/example.c: (gst_example_class_init):
+ * tests/old/testsuite/threads/signals.c: (gst_test_class_init):
+ Fix #337365 (g_type_class_ref <-> g_type_class_peek_parent)
+
2006-04-08 Tim-Philipp Müller <tim at centricular dot net>
* gst/gstpad.c: (gst_pad_link):
diff --git a/gst/gstbuffer.c b/gst/gstbuffer.c
index 8309199e7..a5171879c 100644
--- a/gst/gstbuffer.c
+++ b/gst/gstbuffer.c
@@ -438,7 +438,7 @@ gst_subbuffer_class_init (gpointer g_class, gpointer class_data)
{
GstBufferClass *buffer_class = GST_BUFFER_CLASS (g_class);
- sub_parent_class = g_type_class_ref (GST_TYPE_BUFFER);
+ sub_parent_class = g_type_class_peek_parent (g_class);
buffer_class->mini_object_class.finalize =
(GstMiniObjectFinalizeFunction) gst_subbuffer_finalize;
diff --git a/gst/gstclock.c b/gst/gstclock.c
index d01b2d3c7..ad0d7c4ca 100644
--- a/gst/gstclock.c
+++ b/gst/gstclock.c
@@ -563,7 +563,7 @@ gst_clock_class_init (GstClockClass * klass)
gobject_class = (GObjectClass *) klass;
gstobject_class = (GstObjectClass *) klass;
- parent_class = g_type_class_ref (GST_TYPE_OBJECT);
+ parent_class = g_type_class_peek_parent (klass);
if (!g_thread_supported ())
g_thread_init (NULL);
diff --git a/gst/gstelement.c b/gst/gstelement.c
index 24f251ac1..4a1ef6c0c 100644
--- a/gst/gstelement.c
+++ b/gst/gstelement.c
@@ -171,7 +171,7 @@ gst_element_class_init (GstElementClass * klass)
gobject_class = (GObjectClass *) klass;
gstobject_class = (GstObjectClass *) klass;
- parent_class = g_type_class_ref (GST_TYPE_OBJECT);
+ parent_class = g_type_class_peek_parent (klass);
/**
* GstElement::pad-added:
diff --git a/gst/gstindex.c b/gst/gstindex.c
index ef93149a4..d2073dc1a 100644
--- a/gst/gstindex.c
+++ b/gst/gstindex.c
@@ -157,7 +157,7 @@ gst_index_class_init (GstIndexClass * klass)
gobject_class = (GObjectClass *) klass;
gstelement_class = (GstElementClass *) klass;
- parent_class = g_type_class_ref (GST_TYPE_OBJECT);
+ parent_class = g_type_class_peek_parent (klass);
/**
* GstIndex::entry-added
diff --git a/gst/gstindexfactory.c b/gst/gstindexfactory.c
index cad2abc9e..c5b231214 100644
--- a/gst/gstindexfactory.c
+++ b/gst/gstindexfactory.c
@@ -81,7 +81,7 @@ gst_index_factory_class_init (GstIndexFactoryClass * klass)
gstobject_class = (GstObjectClass *) klass;
gstpluginfeature_class = (GstPluginFeatureClass *) klass;
- factory_parent_class = g_type_class_ref (GST_TYPE_PLUGIN_FEATURE);
+ factory_parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_index_factory_finalize);
}
diff --git a/gst/gstobject.c b/gst/gstobject.c
index 71dc0c853..66e6de4db 100644
--- a/gst/gstobject.c
+++ b/gst/gstobject.c
@@ -217,7 +217,7 @@ gst_object_class_init (GstObjectClass * klass)
gobject_class = (GObjectClass *) klass;
- parent_class = g_type_class_ref (G_TYPE_OBJECT);
+ parent_class = g_type_class_peek_parent (klass);
#ifndef GST_DISABLE_TRACE
_gst_object_trace = gst_alloc_trace_register (g_type_name (GST_TYPE_OBJECT));
@@ -1202,6 +1202,7 @@ gst_object_get_path_string (GstObject * object)
return path;
}
+
struct _GstSignalObject
{
GObject object;
@@ -1251,7 +1252,7 @@ gst_signal_object_class_init (GstSignalObjectClass * klass)
gobject_class = (GObjectClass *) klass;
- parent_class = g_type_class_ref (G_TYPE_OBJECT);
+ parent_class = g_type_class_peek_parent (klass);
#ifndef GST_DISABLE_LOADSAVE_REGISTRY
gst_signal_object_signals[SO_OBJECT_LOADED] =
diff --git a/gst/gstpad.c b/gst/gstpad.c
index 96a7dd46a..34f604b56 100644
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -243,7 +243,7 @@ gst_pad_class_init (GstPadClass * klass)
gobject_class = (GObjectClass *) klass;
gstobject_class = (GstObjectClass *) klass;
- parent_class = g_type_class_ref (GST_TYPE_OBJECT);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_pad_dispose);
gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_pad_finalize);
@@ -759,14 +759,14 @@ failure:
/**
* gst_pad_activate_push:
* @pad: the #GstPad to activate or deactivate.
- * @active: whether or not the pad should be active.
+ * @active: whether the pad should be active or not.
*
* Activates or deactivates the given pad in push mode via dispatching to the
* pad's activatepushfunc. For use from within pad activation functions only.
*
* If you don't know what this is, you probably don't want to call it.
*
- * Returns: TRUE if the operation was successfull.
+ * Returns: %TRUE if the operation was successful.
*
* MT safe.
*/
diff --git a/gst/gstpadtemplate.c b/gst/gstpadtemplate.c
index 9c816656b..42a027fbc 100644
--- a/gst/gstpadtemplate.c
+++ b/gst/gstpadtemplate.c
@@ -153,7 +153,7 @@ gst_pad_template_class_init (GstPadTemplateClass * klass)
gobject_class = (GObjectClass *) klass;
gstobject_class = (GstObjectClass *) klass;
- parent_class = g_type_class_ref (GST_TYPE_OBJECT);
+ parent_class = g_type_class_peek_parent (klass);
/**
* GstPadTemplate::pad-created:
diff --git a/gst/gstpluginfeature.c b/gst/gstpluginfeature.c
index 0e1f6ebe3..2a05a273f 100644
--- a/gst/gstpluginfeature.c
+++ b/gst/gstpluginfeature.c
@@ -51,7 +51,7 @@ static GstObjectClass *parent_class = NULL;
static void
gst_plugin_feature_class_init (GstPluginFeatureClass * klass)
{
- parent_class = g_type_class_ref (GST_TYPE_OBJECT);
+ parent_class = g_type_class_peek_parent (klass);
G_OBJECT_CLASS (klass)->finalize =
GST_DEBUG_FUNCPTR (gst_plugin_feature_finalize);
diff --git a/gst/gstregistry.c b/gst/gstregistry.c
index 10f2abf24..a0c02a195 100644
--- a/gst/gstregistry.c
+++ b/gst/gstregistry.c
@@ -138,7 +138,7 @@ gst_registry_class_init (GstRegistryClass * klass)
gobject_class = (GObjectClass *) klass;
- parent_class = g_type_class_ref (GST_TYPE_OBJECT);
+ parent_class = g_type_class_peek_parent (klass);
gst_registry_signals[PLUGIN_ADDED] =
g_signal_new ("plugin-added", G_TYPE_FROM_CLASS (klass),
diff --git a/gst/gstsystemclock.c b/gst/gstsystemclock.c
index 9d17626ba..a526d59a6 100644
--- a/gst/gstsystemclock.c
+++ b/gst/gstsystemclock.c
@@ -104,7 +104,7 @@ gst_system_clock_class_init (GstSystemClockClass * klass)
gstobject_class = (GstObjectClass *) klass;
gstclock_class = (GstClockClass *) klass;
- parent_class = g_type_class_ref (GST_TYPE_CLOCK);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->dispose = gst_system_clock_dispose;
diff --git a/gst/gsttask.c b/gst/gsttask.c
index d4824f69c..d61829baf 100644
--- a/gst/gsttask.c
+++ b/gst/gsttask.c
@@ -110,7 +110,7 @@ gst_task_class_init (GstTaskClass * klass)
gobject_class = (GObjectClass *) klass;
- parent_class = g_type_class_ref (GST_TYPE_OBJECT);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_task_finalize);
diff --git a/gst/gstxml.c b/gst/gstxml.c
index afba2dc56..ba1a0ef73 100644
--- a/gst/gstxml.c
+++ b/gst/gstxml.c
@@ -87,7 +87,7 @@ gst_xml_class_init (GstXMLClass * klass)
gobject_class = (GObjectClass *) klass;
- parent_class = g_type_class_ref (GST_TYPE_OBJECT);
+ parent_class = g_type_class_peek_parent (klass);
/* FIXME G_TYPE_POINTER should be GType of xmlNodePtr
* (ensonic) can't be fixed, as libxml does not use GObject (unfortunately)
diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c
index 00111c513..f5fe211f9 100644
--- a/libs/gst/base/gstbasesink.c
+++ b/libs/gst/base/gstbasesink.c
@@ -300,7 +300,7 @@ gst_base_sink_class_init (GstBaseSinkClass * klass)
g_type_class_add_private (klass, sizeof (GstBaseSinkPrivate));
- parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_base_sink_finalize);
gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_base_sink_set_property);
diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c
index bb2b69666..5f99d1159 100644
--- a/libs/gst/base/gstbasesrc.c
+++ b/libs/gst/base/gstbasesrc.c
@@ -297,7 +297,7 @@ gst_base_src_class_init (GstBaseSrcClass * klass)
g_type_class_add_private (klass, sizeof (GstBaseSrcPrivate));
- parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_base_src_finalize);
gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_base_src_set_property);
@@ -1383,8 +1383,11 @@ gst_base_src_loop (GstPad * pad)
if (G_UNLIKELY (ret != GST_FLOW_OK)) {
if (ret == GST_FLOW_UNEXPECTED)
goto eos;
- else
+ else {
+ GST_INFO_OBJECT (src, "pausing after gst_base_src_get_range() = %d",
+ ret);
goto pause;
+ }
}
if (G_UNLIKELY (buf == NULL))
goto error;
@@ -1434,8 +1437,10 @@ gst_base_src_loop (GstPad * pad)
}
ret = gst_pad_push (pad, buf);
- if (G_UNLIKELY (ret != GST_FLOW_OK))
+ if (G_UNLIKELY (ret != GST_FLOW_OK)) {
+ GST_INFO_OBJECT (src, "pausing after gst_pad_push() = %d", ret);
goto pause;
+ }
if (eos)
goto eos;
diff --git a/libs/gst/controller/gstcontroller.c b/libs/gst/controller/gstcontroller.c
index c70991cba..f8802bc28 100644
--- a/libs/gst/controller/gstcontroller.c
+++ b/libs/gst/controller/gstcontroller.c
@@ -1101,7 +1101,7 @@ _gst_controller_class_init (GstControllerClass * klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- parent_class = g_type_class_ref (G_TYPE_OBJECT);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = _gst_controller_finalize;
diff --git a/plugins/elements/gstfdsrc.c b/plugins/elements/gstfdsrc.c
index bd02f5728..1ad6e04dd 100644
--- a/plugins/elements/gstfdsrc.c
+++ b/plugins/elements/gstfdsrc.c
@@ -147,7 +147,7 @@ gst_fd_src_class_init (GstFdSrcClass * klass)
gstbasesrc_class = (GstBaseSrcClass *) klass;
gstpush_src_class = (GstPushSrcClass *) klass;
- parent_class = g_type_class_ref (GST_TYPE_PUSH_SRC);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = gst_fd_src_set_property;
gobject_class->get_property = gst_fd_src_get_property;
diff --git a/plugins/indexers/gstfileindex.c b/plugins/indexers/gstfileindex.c
index 52f704a63..2885470dd 100644
--- a/plugins/indexers/gstfileindex.c
+++ b/plugins/indexers/gstfileindex.c
@@ -179,7 +179,7 @@ gst_file_index_class_init (GstFileIndexClass * klass)
gobject_class = (GObjectClass *) klass;
gstindex_class = (GstIndexClass *) klass;
- parent_class = g_type_class_ref (GST_TYPE_INDEX);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->dispose = gst_file_index_dispose;
gobject_class->set_property = gst_file_index_set_property;
diff --git a/plugins/indexers/gstmemindex.c b/plugins/indexers/gstmemindex.c
index 75590a9cd..2d48b12f0 100644
--- a/plugins/indexers/gstmemindex.c
+++ b/plugins/indexers/gstmemindex.c
@@ -155,7 +155,7 @@ gst_mem_index_class_init (GstMemIndexClass * klass)
gobject_class = (GObjectClass *) klass;
gstindex_class = (GstIndexClass *) klass;
- parent_class = g_type_class_ref (GST_TYPE_INDEX);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->dispose = gst_mem_index_dispose;
diff --git a/tests/old/examples/plugins/example.c b/tests/old/examples/plugins/example.c
index d87ebf03c..511cd817a 100644
--- a/tests/old/examples/plugins/example.c
+++ b/tests/old/examples/plugins/example.c
@@ -148,7 +148,7 @@ gst_example_class_init (GstExampleClass * klass)
gstelement_class = (GstElementClass *) klass;
/* The parent class is needed for class method overrides. */
- parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
+ parent_class = g_type_class_peek_parent (klass);
/* Here we add an argument to the object. This argument is an integer,
* and can be both read and written.
diff --git a/tests/old/testsuite/threads/signals.c b/tests/old/testsuite/threads/signals.c
index e4fe4ce10..b8cd067d6 100644
--- a/tests/old/testsuite/threads/signals.c
+++ b/tests/old/testsuite/threads/signals.c
@@ -90,7 +90,7 @@ gst_test_class_init (GstTestClass * klass)
gobject_class = (GObjectClass *) klass;
gstobject_class = (GstObjectClass *) klass;
- parent_class = g_type_class_ref (GST_TYPE_OBJECT);
+ parent_class = g_type_class_peek_parent (klass);
if (!g_thread_supported ())
g_thread_init (NULL);