summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2005-09-23 15:36:28 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2005-09-23 15:36:28 +0000
commit3f519e30e9fe194e7228f1e0c1549eb44ebc8471 (patch)
treea1f4f684e43d70e110b856e61eb4cdc26eab9d6a
parent5afb6e6809ad1d8eb73e2e347d32a9239c3f845d (diff)
various doc updates
Original commit message from CVS: * docs/README: * gst/gstpad.c: (gst_pad_class_init), (gst_pad_chain): * gst/gstpluginfeature.c: * gst/gstutils.c: various doc updates * gst/base/gstbasesink.c: (gst_base_sink_handle_object): change an assert into an error until it gets fixed properly
-rw-r--r--ChangeLog10
-rw-r--r--docs/README8
-rw-r--r--gst/base/gstbasesink.c9
-rw-r--r--gst/gstpad.c6
-rw-r--r--gst/gstpluginfeature.c4
-rw-r--r--gst/gstutils.c2
-rw-r--r--libs/gst/base/gstbasesink.c9
7 files changed, 40 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index feda752a55..537cf3f2ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-09-23 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * docs/README:
+ * gst/gstpad.c: (gst_pad_class_init), (gst_pad_chain):
+ * gst/gstpluginfeature.c:
+ * gst/gstutils.c:
+ various doc updates
+ * gst/base/gstbasesink.c: (gst_base_sink_handle_object):
+ change an assert into an error until it gets fixed properly
+
2005-09-23 Stefan Kost <ensonic@users.sf.net>
* docs/gst/gstreamer-sections.txt:
diff --git a/docs/README b/docs/README
index 2a007660c5..df1230251a 100644
--- a/docs/README
+++ b/docs/README
@@ -204,6 +204,7 @@ in the various plugin packages.
- template can be copied from gst-plugins-base
- to add an element to be documented:
- add an include href in the Elements chapter for the element
+ in the main .sgml
- add a section for it in -sections.txt with
<FILE>element-(element)</FILE>
<TITLE>(element)</TITLE>
@@ -232,12 +233,19 @@ in the various plugin packages.
make clean
make inspect-update
make
+ - examples will only show up using gtk-doc 1.4 or later - it relies on
+ merging stuff from .sgml with inline docs. We might want to change
+ this to only get stuff from the source.
- to add a plugin to be documented:
- make sure inspect/ has generated a .xml file for it
- add it to CVS
- add an include in -docs.sgml in the Plugins list for that plugin
+- possible errors:
+ "multiple constraints for linkend ID": check if each section in
+ -sections.txt actually starts and ends with <SECTION> and </SECTION>
+
RANDOM THINGS I'VE LEARNED
==========================
diff --git a/gst/base/gstbasesink.c b/gst/base/gstbasesink.c
index f7be1c4578..7c8c1387b7 100644
--- a/gst/base/gstbasesink.c
+++ b/gst/base/gstbasesink.c
@@ -650,9 +650,16 @@ gst_base_sink_handle_object (GstBaseSink * basesink, GstPad * pad,
if (!basesink->need_preroll)
goto no_preroll;
+
length = basesink->preroll_queued;
- g_assert (length == 1);
+ /* FIXME: a pad probe could have made us lose the buffer, according
+ * to one of the python tests */
+ if (length == 0) {
+ GST_ERROR_OBJECT (basesink,
+ "preroll_queued dropped from 1 to 0 while committing state change");
+ }
+ g_assert (length <= 1);
}
/* see if we need to block now. We cannot block on events, only
diff --git a/gst/gstpad.c b/gst/gstpad.c
index 18f3d65da2..49c04beed7 100644
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -198,8 +198,8 @@ gst_pad_class_init (GstPadClass * klass)
* @pad: the pad that emitted the signal
* @mini_obj: new data
*
- * Signals that new data is available on the pad. This signal is used
- * internally for implementing pad probes.
+ * Signals that new data is available on the pad. This signal is used
+ * internally for implementing pad probes.
* See gst_pad_add_*_probe functions.
*
* Returns: %TRUE to keep the data, %FALSE to drop it
@@ -3009,7 +3009,7 @@ flushing:
dropping:
{
gst_buffer_unref (buffer);
- GST_DEBUG ("Dropping buffer due to FALSE probe return");
+ GST_DEBUG_OBJECT (pad, "Dropping buffer due to FALSE probe return");
GST_STREAM_UNLOCK (pad);
return GST_FLOW_OK;
}
diff --git a/gst/gstpluginfeature.c b/gst/gstpluginfeature.c
index 749328482b..d5bef7f5b8 100644
--- a/gst/gstpluginfeature.c
+++ b/gst/gstpluginfeature.c
@@ -80,11 +80,11 @@ gst_plugin_feature_finalize (GObject * object)
* unaffected; use the return value instead.
*
* Normally this function is used like this:
- *
+ *
* <programlisting>
* GstPluginFeature *loaded_feature;
* loaded_feature = gst_plugin_feature_load (feature);
- *
+ *
* // presumably, we're no longer interested in the potentially-unloaded feature
* gst_object_unref (feature);
* feature = loaded_feature;
diff --git a/gst/gstutils.c b/gst/gstutils.c
index d862495cc2..24851c71bd 100644
--- a/gst/gstutils.c
+++ b/gst/gstutils.c
@@ -2446,7 +2446,7 @@ gst_atomic_int_set (gint * atomic_int, gint value)
* to drop it. Dropping data is rarely useful, but occasionally comes in handy
* with events.
*
- * Although probes are implemeted internally by connecting @handler to the
+ * Although probes are implemented internally by connecting @handler to the
* have-data signal on the pad, if you want to remove a probe it is insufficient
* to only call g_signal_handler_disconnect on the returned handler id. To
* remove a probe, use the appropriate function, such as
diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c
index f7be1c4578..7c8c1387b7 100644
--- a/libs/gst/base/gstbasesink.c
+++ b/libs/gst/base/gstbasesink.c
@@ -650,9 +650,16 @@ gst_base_sink_handle_object (GstBaseSink * basesink, GstPad * pad,
if (!basesink->need_preroll)
goto no_preroll;
+
length = basesink->preroll_queued;
- g_assert (length == 1);
+ /* FIXME: a pad probe could have made us lose the buffer, according
+ * to one of the python tests */
+ if (length == 0) {
+ GST_ERROR_OBJECT (basesink,
+ "preroll_queued dropped from 1 to 0 while committing state change");
+ }
+ g_assert (length <= 1);
}
/* see if we need to block now. We cannot block on events, only