Commit 25916cff authored by Sebastian Dröge's avatar Sebastian Dröge

event: Rename renegotiate event to reconfigure

In 0.11 this event will also do reconfiguration of buffer pools
and similar things, not just renegotiation.
parent 40cff0eb
......@@ -872,6 +872,8 @@ gst_event_parse_step
gst_event_new_sink_message
gst_event_parse_sink_message
gst_event_new_reconfigure
<SUBSECTION Standard>
GstEventClass
GST_EVENT
......
......@@ -109,7 +109,7 @@ static GstEventQuarks event_quarks[] = {
{GST_EVENT_NAVIGATION, "navigation", 0},
{GST_EVENT_LATENCY, "latency", 0},
{GST_EVENT_STEP, "step", 0},
{GST_EVENT_RENEGOTIATE, "renegotiate", 0},
{GST_EVENT_RECONFIGURE, "reconfigure", 0},
{GST_EVENT_CUSTOM_UPSTREAM, "custom-upstream", 0},
{GST_EVENT_CUSTOM_DOWNSTREAM, "custom-downstream", 0},
{GST_EVENT_CUSTOM_DOWNSTREAM_OOB, "custom-downstream-oob", 0},
......@@ -1283,24 +1283,24 @@ gst_event_parse_step (GstEvent * event, GstFormat * format, guint64 * amount,
}
/**
* gst_event_new_renegotiate:
* gst_event_new_reconfigure:
* Create a new renegotiate event. The purpose of the step event is to travel
* Create a new reconfigure event. The purpose of the step event is to travel
* upstream and make elements renegotiate its caps. This is useful when changing
* properties or elements on the pipeline.
*
* Returns: (transfer full): a new #GstEvent
*
* Since: 0.10.33
* Since: 0.10.34
*/
GstEvent *
gst_event_new_renegotiate (void)
gst_event_new_reconfigure (void)
{
GstEvent *event;
GST_CAT_INFO (GST_CAT_EVENT, "creating renegotiate event");
GST_CAT_INFO (GST_CAT_EVENT, "creating reconfigure event");
event = gst_event_new_custom (GST_EVENT_RENEGOTIATE, NULL);
event = gst_event_new_custom (GST_EVENT_RECONFIGURE, NULL);
return event;
}
......
......@@ -115,8 +115,8 @@ typedef enum {
* Since: 0.10.12
* @GST_EVENT_STEP: A request for stepping through the media. Sinks will usually
* execute the step operation. Since: 0.10.24
* @GST_EVENT_RENEGOTIATE: A request for upstream renegotiating caps.
* Since: 0.10.33
* @GST_EVENT_RECONFIGURE: A request for upstream renegotiating caps and reconfiguring.
* Since: 0.10.34
* @GST_EVENT_CUSTOM_UPSTREAM: Upstream custom event
* @GST_EVENT_CUSTOM_DOWNSTREAM: Downstream custom event that travels in the
* data flow.
......@@ -152,7 +152,7 @@ typedef enum {
GST_EVENT_NAVIGATION = GST_EVENT_MAKE_TYPE (17, 0, FLAG(UPSTREAM)),
GST_EVENT_LATENCY = GST_EVENT_MAKE_TYPE (18, 0, FLAG(UPSTREAM)),
GST_EVENT_STEP = GST_EVENT_MAKE_TYPE (19, 0, FLAG(UPSTREAM)),
GST_EVENT_RENEGOTIATE = GST_EVENT_MAKE_TYPE (20, 0, FLAG(UPSTREAM)),
GST_EVENT_RECONFIGURE = GST_EVENT_MAKE_TYPE (20, 0, FLAG(UPSTREAM)),
/* custom events start here */
GST_EVENT_CUSTOM_UPSTREAM = GST_EVENT_MAKE_TYPE (32, 0, FLAG(UPSTREAM)),
......@@ -527,7 +527,7 @@ void gst_event_parse_step (GstEvent *event, GstFormat *for
gdouble *rate, gboolean *flush, gboolean *intermediate);
/* renegotiate event */
GstEvent* gst_event_new_renegotiate (void);
GstEvent* gst_event_new_reconfigure (void);
G_END_DECLS
......
......@@ -52,7 +52,7 @@ static const gchar *_quark_strings[] = {
"quality", "processed", "dropped", "buffering-ranges", "GstMessageProgress",
"code", "text", "percent", "timeout", "GstBufferPoolConfig", "caps", "size",
"min-buffers", "max-buffers", "prefix", "postfix", "align", "time",
"GstQueryAllocation", "need-pool", "meta", "pool", "GstEventCaps", "GstEventRenegotiate"
"GstQueryAllocation", "need-pool", "meta", "pool", "GstEventCaps", "GstEventReconfigure"
};
GQuark _priv_gst_quark_table[GST_QUARK_MAX];
......
......@@ -146,7 +146,7 @@ typedef enum _GstQuarkId
GST_QUARK_META = 117,
GST_QUARK_POOL = 118,
GST_QUARK_EVENT_CAPS = 119,
GST_QUARK_EVENT_RENEGOTIATE = 120,
GST_QUARK_EVENT_RECONFIGURE = 120,
GST_QUARK_MAX = 121
} GstQuarkId;
......
......@@ -404,7 +404,7 @@ EXPORTS
gst_event_new_new_segment_full
gst_event_new_qos
gst_event_new_qos_full
gst_event_new_renegotiate
gst_event_new_reconfigure
gst_event_new_seek
gst_event_new_sink_message
gst_event_new_step
......
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