Commit a28d6343 authored by Stefan Kost's avatar Stefan Kost

gst/gstbin.h: removed ';' from the end of macro defs

Original commit message from CVS:
* gst/gstbin.h:
removed ';' from the end of macro defs
* docs/gst/gstreamer-docs.sgml:
* docs/gst/gstreamer-sections.txt:
* docs/gst/tmpl/.cvsignore:
* gst/gstbus.h:
* gst/gstelement.c: (gst_element_class_init),
(gst_element_set_state), (activate_pads),
(gst_element_save_thyself):
* gst/gstevent.c: (gst_event_new_newsegment):
* gst/gstevent.h:
* gst/gstiterator.c:
* gst/gstiterator.h:
* gst/gstpad.c:
* gst/gstprobe.h:
* gst/gstutils.c: (gst_pad_query_convert):
* gst/gstutils.h:
fixed parameter name mismatches between source, header and docs
added some more docs, resolved the last batch of unused elements in
docs (now someone needs to doc them)
parent 34359ad6
2005-08-26 Stefan Kost <ensonic@users.sf.net>
* gst/gstbin.h:
removed ';' from the end of macro defs
* docs/gst/gstreamer-docs.sgml:
* docs/gst/gstreamer-sections.txt:
* docs/gst/tmpl/.cvsignore:
* gst/gstbus.h:
* gst/gstelement.c: (gst_element_class_init),
(gst_element_set_state), (activate_pads),
(gst_element_save_thyself):
* gst/gstevent.c: (gst_event_new_newsegment):
* gst/gstevent.h:
* gst/gstiterator.c:
* gst/gstiterator.h:
* gst/gstpad.c:
* gst/gstprobe.h:
* gst/gstutils.c: (gst_pad_query_convert):
* gst/gstutils.h:
fixed parameter name mismatches between source, header and docs
added some more docs, resolved the last batch of unused elements in
docs (now someone needs to doc them)
2005-08-25 Thomas Vander Stichele <thomas at apestaart dot org>
* gst/registries/gstlibxmlregistry.c: (gst_xml_registry_rebuild):
......
......@@ -8,6 +8,7 @@
<!ENTITY GstBuffer SYSTEM "xml/gstbuffer.xml">
<!ENTITY GstBus SYSTEM "xml/gstbus.xml">
<!ENTITY GstCaps SYSTEM "xml/gstcaps.xml">
<!ENTITY GstCheck SYSTEM "xml/gstcheck.xml">
<!ENTITY GstChildProxy SYSTEM "xml/gstchildproxy.xml">
<!ENTITY GstClock SYSTEM "xml/gstclock.xml">
<!--
......@@ -108,6 +109,7 @@
&GstBuffer;
&GstBus;
&GstCaps;
&GstCheck;
&GstChildProxy;
&GstClock;
&GstConfig;
......
This diff is collapsed.
......@@ -8,6 +8,7 @@ gstbasetransform.sgml
gstbin.sgml
gstbuffer.sgml
gstbus.sgml
gstcheck.sgml
gstcollectpads.sgml
gstevent.sgml
gstfakesrc.sgml
......@@ -15,6 +16,7 @@ gstfakesink.sgml
gstfilesrc.sgml
gstfilesink.sgml
gstmessage.sgml
gstminiobject.sgml
gstprobe.sgml
gstpushsrc.sgml
gsttask.sgml
......
......@@ -65,7 +65,7 @@ typedef struct _GstBinClass GstBinClass;
*
* Returns: the number of child objects
*/
#define GST_BIN_NUMCHILDREN(bin) (GST_BIN_CAST(bin)->numchildren);
#define GST_BIN_NUMCHILDREN(bin) (GST_BIN_CAST(bin)->numchildren)
/**
* GST_BIN_CHILDREN:
* @bin: the bin to get the list with children from
......@@ -74,7 +74,7 @@ typedef struct _GstBinClass GstBinClass;
*
* Returns: the children list
*/
#define GST_BIN_CHILDREN(bin) (GST_BIN_CAST(bin)->children);
#define GST_BIN_CHILDREN(bin) (GST_BIN_CAST(bin)->children)
/**
* GST_BIN_CHILDREN_COOKIE:
* @bin: the bin to get the children cookie from
......@@ -83,7 +83,7 @@ typedef struct _GstBinClass GstBinClass;
*
* Returns: the children cookie
*/
#define GST_BIN_CHILDREN_COOKIE(bin) (GST_BIN_CAST(bin)->children_cookie);
#define GST_BIN_CHILDREN_COOKIE(bin) (GST_BIN_CAST(bin)->children_cookie)
struct _GstBin {
GstElement element;
......
......@@ -52,7 +52,29 @@ typedef enum
GST_BUS_ASYNC = 2, /* pass message to async queue, continue if message is handled */
} GstBusSyncReply;
/**
* GstBusSyncHandler:
* @bus: the #GstBus that sent the message
* @messages: the #GstMessage
* @data: user data that has been given, when registering the handler
*
* Handler will be invoked synchronously, when a new message has been injected
* into the bus.
*
* Returns: #GstBusSyncReply stating what to do with the message
*/
typedef GstBusSyncReply (*GstBusSyncHandler) (GstBus * bus, GstMessage * message, gpointer data);
/**
* GstBusHandler:
* @bus: the #GstBus that sent the message
* @messages: the #GstMessage
* @data: user data that has been given, when registering the handler
*
* Handler will be invoked asynchronously, after a new message has been injected
* into the bus.
*
* Returns: %TRUE if message should be taken from the bus
*/
typedef gboolean (*GstBusHandler) (GstBus * bus, GstMessage * message, gpointer data);
struct _GstBus
......
......@@ -116,8 +116,8 @@ gst_element_class_init (GstElementClass * klass)
/**
* GstElement::state-changed:
* @gstelement: the object which received the signal
* @int:
* @int:
* @old_state: the GST_STATE_XXX before the change
* @new_state: the GST_STATE_XXX after the change
*
* the #GstElementState of the element has been changed
*/
......@@ -128,7 +128,7 @@ gst_element_class_init (GstElementClass * klass)
/**
* GstElement::pad-added:
* @gstelement: the object which received the signal
* @object:
* @new_pad: the pad that has been added
*
* a new #GstPad has been added to the element
*/
......@@ -139,7 +139,7 @@ gst_element_class_init (GstElementClass * klass)
/**
* GstElement::pad-removed:
* @gstelement: the object which received the signal
* @object:
* @old_pad: the pad that has been removed
*
* a #GstPad has been removed from the element
*/
......@@ -151,7 +151,7 @@ gst_element_class_init (GstElementClass * klass)
* GstElement::no-more-pads:
* @gstelement: the object which received the signal
*
* ?
* This signals that the element will not generate more dynamic pads.
*/
gst_element_signals[NO_MORE_PADS] =
g_signal_new ("no-more-pads", G_TYPE_FROM_CLASS (klass),
......@@ -1140,14 +1140,17 @@ gst_element_send_event (GstElement * element, GstEvent * event)
/**
* gst_element_seek:
* @element: a #GstElement to send the event to.
* @seek_method: the method to use for seeking (GST_SEEK_METHOD_*).
* @seek_format: the #GstFormat to use for seeking (GST_FORMAT_*).
* @seek_flags: the flags to use for seeking (GST_SEEK_FLAG_*).
* @offset: the offset to seek to (in the given seek_format).
* @rate: The new playback rate
* @format: The format of the seek values
* @flags: The optional seek flags.
* @cur_type: The type and flags for the new current position
* @cur: The value of the new current position
* @stop_type: The type and flags for the new stop position
* @stop: The value of the new stop position
*
* Sends a seek event to an element.
*
* Returns: TRUE if the event was handled.
* Returns: %TRUE if the event was handled.
*
* MT safe.
*/
......@@ -1765,6 +1768,7 @@ gst_element_set_state (GstElement * element, GstElementState state)
GstElementState pending;
GTimeVal tv;
g_return_val_if_fail (GST_IS_ELEMENT (element), GST_STATE_FAILURE);
/* get current element state, need to call the method so that
* we call the virtual method and subclasses can implement their
......@@ -1778,6 +1782,7 @@ gst_element_set_state (GstElement * element, GstElementState state)
GST_STATE_FINAL (element) = state;
if (ret == GST_STATE_ASYNC) {
gst_element_commit_state (element);
gst_element_lost_state (element);
}
/* start with the current state */
......@@ -1887,6 +1892,8 @@ activate_pads (GstPad * pad, GValue * ret, gboolean * active)
{
if (!gst_pad_set_active (pad, *active))
g_value_set_boolean (ret, FALSE);
else if (!*active)
gst_pad_set_caps (pad, NULL);
gst_object_unref (pad);
return TRUE;
......@@ -2120,10 +2127,6 @@ gst_element_save_thyself (GstObject * object, xmlNodePtr parent)
(xmlChar *) GST_PLUGIN_FEATURE (factory)->name);
}
/* FIXME: what is this? */
/* if (element->manager) */
/* xmlNewChild(parent, NULL, "manager", GST_ELEMENT_NAME(element->manager)); */
/* params */
specs = g_object_class_list_properties (G_OBJECT_GET_CLASS (object), &nspecs);
......
......@@ -279,8 +279,8 @@ gst_event_new_eos (void)
* gst_event_new_newsegment:
* @rate: a new rate for playback
* @format: The format of the segment values
* @start_val: the start value of the segment
* @stop_val: the stop value of the segment
* @start_value: the start value of the segment
* @stop_value: the stop value of the segment
* @base: base value for buffer timestamps.
*
* Allocate a new newsegment event with the given format/values tripplets.
......@@ -299,30 +299,30 @@ gst_event_new_eos (void)
*/
GstEvent *
gst_event_new_newsegment (gdouble rate, GstFormat format,
gint64 start_val, gint64 stop_val, gint64 base)
gint64 start_value, gint64 stop_value, gint64 base)
{
if (format == GST_FORMAT_TIME) {
GST_CAT_INFO (GST_CAT_EVENT,
"creating newsegment rate %lf, format GST_FORMAT_TIME, "
"start %" GST_TIME_FORMAT ", stop %" GST_TIME_FORMAT
", base %" GST_TIME_FORMAT,
rate, GST_TIME_ARGS (start_val),
GST_TIME_ARGS (stop_val), GST_TIME_ARGS (base));
rate, GST_TIME_ARGS (start_value),
GST_TIME_ARGS (stop_value), GST_TIME_ARGS (base));
} else {
GST_CAT_INFO (GST_CAT_EVENT,
"creating newsegment rate %lf, format %d, "
"start %lld, stop %lld, base %lld",
rate, format, start_val, stop_val, base);
rate, format, start_value, stop_value, base);
}
if (start_val != -1 && stop_val != -1)
g_return_val_if_fail (start_val < stop_val, NULL);
if (start_value != -1 && stop_value != -1)
g_return_val_if_fail (start_value < stop_value, NULL);
return gst_event_new_custom (GST_EVENT_NEWSEGMENT,
gst_structure_new ("GstEventNewsegment", "rate", G_TYPE_DOUBLE, rate,
"format", GST_TYPE_FORMAT, format,
"start_val", G_TYPE_INT64, start_val,
"stop_val", G_TYPE_INT64, stop_val,
"start_val", G_TYPE_INT64, start_value,
"stop_val", G_TYPE_INT64, stop_value,
"base", G_TYPE_INT64, base, NULL));
}
......
......@@ -272,11 +272,11 @@ GstEvent * gst_event_new_flush_stop (void);
GstEvent * gst_event_new_eos (void);
/* newsegment events */
GstEvent* gst_event_new_newsegment (gdouble rate,
GstFormat format, gint64 start_value, gint64 stop_value,
GstEvent* gst_event_new_newsegment (gdouble rate, GstFormat format,
gint64 start_value, gint64 stop_value,
gint64 base);
void gst_event_parse_newsegment (GstEvent *event, gdouble *rate, GstFormat *format,
gint64 *start_value, gint64 *end_value, gint64 *base);
gint64 *start_value, gint64 *stop_value, gint64 *base);
/* tag event */
GstEvent* gst_event_new_tag (GstTagList *taglist);
void gst_event_parse_tag (GstEvent *event, GstTagList **taglist);
......
......@@ -473,7 +473,7 @@ foreach_fold_func (gpointer item, GValue * unused, ForeachFoldData * data)
/**
* gst_iterator_foreach:
* @it: The #GstIterator to iterate
* @iter: The #GstIterator to iterate
* @func: the function to call for each element.
* @user_data: user data passed to the function
*
......
......@@ -90,7 +90,7 @@ GstIterator* gst_iterator_new_list (GMutex *lock,
GstIteratorDisposeFunction free);
/* using iterators */
GstIteratorResult gst_iterator_next (GstIterator *it, gpointer *result);
GstIteratorResult gst_iterator_next (GstIterator *it, gpointer *elem);
void gst_iterator_resync (GstIterator *it);
void gst_iterator_free (GstIterator *it);
......
......@@ -855,7 +855,7 @@ gst_pad_is_blocked (GstPad * pad)
/**
* gst_pad_set_activate_function:
* @pad: a sink #GstPad.
* @chain: the #GstPadActivateFunction to set.
* @activate: the #GstPadActivateFunction to set.
*
* Sets the given activate function for the pad. The activate function will
* dispatch to activate_push or activate_pull to perform the actual activation.
......@@ -876,7 +876,7 @@ gst_pad_set_activate_function (GstPad * pad, GstPadActivateFunction activate)
/**
* gst_pad_set_activatepull_function:
* @pad: a sink #GstPad.
* @chain: the #GstPadActivateModeFunction to set.
* @activatepull: the #GstPadActivateModeFunction to set.
*
* Sets the given activate_pull function for the pad. An activate_pull function
* prepares the element and any upstream connections for pulling. See XXX
......@@ -896,7 +896,7 @@ gst_pad_set_activatepull_function (GstPad * pad,
/**
* gst_pad_set_activatepush_function:
* @pad: a sink #GstPad.
* @chain: the #GstPadActivateModeFunction to set.
* @activatepush: the #GstPadActivateModeFunction to set.
*
* Sets the given activate_push function for the pad. An activate_push function
* prepares the element for pushing. See XXX part-activation.txt for details.
......@@ -3140,9 +3140,9 @@ not_connected:
/**
* gst_pad_get_range:
* @pad: a src #GstPad.
* @buffer: a pointer to hold the #GstBuffer.
* @offset: The start offset of the buffer
* @length: The length of the buffer
* @size: The length of the buffer
* @buffer: a pointer to hold the #GstBuffer.
*
* Calls the getrange function of @pad.
*
......@@ -3223,9 +3223,9 @@ dropping:
/**
* gst_pad_pull_range:
* @pad: a sink #GstPad.
* @buffer: a pointer to hold the #GstBuffer.
* @offset: The start offset of the buffer
* @length: The length of the buffer
* @size: The length of the buffer
* @buffer: a pointer to hold the #GstBuffer.
*
* Pulls a buffer from the peer pad. @pad must be linked.
*
......
......@@ -54,7 +54,7 @@ GstProbe* gst_probe_new (gboolean single_shot,
gpointer user_data);
void gst_probe_destroy (GstProbe *probe);
gboolean gst_probe_perform (GstProbe *probe, GstMiniObject **data);
gboolean gst_probe_perform (GstProbe *probe, GstMiniObject **mini_object);
typedef struct _GstProbeDispatcher GstProbeDispatcher;
......
......@@ -1234,7 +1234,7 @@ gst_element_link_pads (GstElement * src, const gchar * srcpadname,
* @srcpadname: the name of the #GstPad in source element or NULL for any pad.
* @dest: the #GstElement containing the destination pad.
* @destpadname: the name of the #GstPad in destination element or NULL for any pad.
* @caps: the #GstCaps to filter the link, or #NULL for no filter.
* @filter: the #GstCaps to filter the link, or #NULL for no filter.
*
* Links the two named pads of the source and destination elements. Side effect
* is that if one of the pads has no parent, it becomes a child of the parent of
......@@ -1673,7 +1673,7 @@ gst_pad_get_parent_element (GstPad * pad)
/**
* gst_flow_get_name:
* @state: a #GstFlowReturn to get the name of.
* @ret: a #GstFlowReturn to get the name of.
*
* Gets a string representing the given flow return.
*
......@@ -1708,8 +1708,7 @@ gst_flow_get_name (GstFlowReturn ret)
/**
* gst_object_default_error:
* @object: a #GObject that signalled the error.
* @orig: the #GstObject that initiated the error.
* @source: the #GstObject that initiated the error.
* @error: the GError.
* @debug: an additional debug information string, or NULL.
*
......@@ -2208,25 +2207,25 @@ gst_pad_query_position (GstPad * pad, GstFormat * format, gint64 * cur,
*/
gboolean
gst_pad_query_convert (GstPad * pad, GstFormat src_format, gint64 src_val,
GstFormat * dest_fmt, gint64 * dest_val)
GstFormat * dest_format, gint64 * dest_val)
{
GstQuery *query;
gboolean ret;
g_return_val_if_fail (GST_IS_PAD (pad), FALSE);
g_return_val_if_fail (dest_fmt != NULL, FALSE);
g_return_val_if_fail (dest_format != NULL, FALSE);
g_return_val_if_fail (dest_val != NULL, FALSE);
if (*dest_fmt == src_format) {
if (*dest_format == src_format) {
*dest_val = src_val;
return TRUE;
}
query = gst_query_new_convert (src_format, src_val, *dest_fmt);
query = gst_query_new_convert (src_format, src_val, *dest_format);
ret = gst_pad_query (pad, query);
if (ret)
gst_query_parse_convert (query, NULL, NULL, dest_fmt, dest_val);
gst_query_parse_convert (query, NULL, NULL, dest_format, dest_val);
gst_query_unref (query);
......
......@@ -339,7 +339,7 @@ G_CONST_RETURN gchar* gst_flow_get_name (GstFlowReturn ret);
gboolean gst_pad_query_position (GstPad *pad, GstFormat *format,
gint64 *cur, gint64 *end);
gboolean gst_pad_query_convert (GstPad *pad, GstFormat src_format, gint64 src_val,
GstFormat *dest_fmt, gint64 *dest_val);
GstFormat *dest_format, gint64 *dest_val);
/* bin functions */
void gst_bin_add_many (GstBin *bin, GstElement *element_1, ...);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment