Commit 63ee7366 authored by David Schleef's avatar David Schleef
Browse files

Global change from "caps2" to "caps". Script is: #!/bin/sh find . -name...

Global change from "caps2" to "caps".  Script is: #!/bin/sh find . -name '*.[chy]' -exec perl -i -p \

Original commit message from CVS:
Global change from "caps2" to "caps".  Script is:
#!/bin/sh

find . -name '*.[chy]' -exec perl -i -p \
-e 's/gst_static_caps2_/gst_static_caps_/g;\
s/GST_CAPS2_/GST_CAPS_/g;\
s/gst_caps2_/gst_caps_/g;\
s/GstCaps2/GstCaps/g;\
s/GstStaticCaps2/GstStaticCaps/g;\
s/GST_STATIC_CAPS2_/GST_STATIC_CAPS_/g;\
s/GST_TYPE_CAPS2/GST_TYPE_CAPS/g;\
s/gst_caps_get_nth_cap/gst_caps_get_structure/g;\
s/gst_caps_get_n_structures/gst_caps_get_size/g;\
s/gst_caps_append_cap/gst_caps_append_structure/g;\
s/GST_CAPS2_/GST_CAPS_/g;' \
{} \;
parent e1eb5e2d
......@@ -40,12 +40,12 @@ void eos(GstElement *element)
/* playing = FALSE; */
}
G_GNUC_UNUSED static GstCaps2*
G_GNUC_UNUSED static GstCaps*
gst_play_type_find (GstBin *bin, GstElement *element)
{
GstElement *typefind;
GstElement *pipeline;
GstCaps2 *caps = NULL;
GstCaps *caps = NULL;
GST_DEBUG ("GstPipeline: typefind for element \"%s\"",
GST_ELEMENT_NAME(element));
......@@ -238,7 +238,7 @@ create_input_channel (int id, char* location)
char buffer[20]; /* hold the names */
/* GstAutoplug *autoplug;
GstCaps2 *srccaps; */
GstCaps *srccaps; */
GstElement *new_element;
GstElement *decoder;
......@@ -330,7 +330,7 @@ create_input_channel (int id, char* location)
#endif
new_element = gst_autoplug_to_caps (autoplug, srccaps,
gst_caps2_new ("audio/raw", NULL), NULL);
gst_caps_new ("audio/raw", NULL), NULL);
if (!new_element) {
g_print ("could not autoplug, no suitable codecs found...\n");
......
#include <gst/gst.h>
void
type_found (GstElement *typefind, const GstCaps2 * caps)
type_found (GstElement *typefind, const GstCaps * caps)
{
xmlDocPtr doc;
xmlNodePtr parent;
......@@ -11,7 +11,7 @@ type_found (GstElement *typefind, const GstCaps2 * caps)
parent = xmlNewChild (doc->xmlRootNode, NULL, "Caps1", NULL);
/* FIXME */
//gst_caps2_save_thyself (caps, parent);
//gst_caps_save_thyself (caps, parent);
xmlDocDump (stdout, doc);
}
......
......@@ -58,23 +58,23 @@ g_list_free_list_and_elements (GList *list)
* Returns: TRUE, if both caps intersect.
*/
gboolean
gst_autoplug_caps_intersect (const GstCaps2 *src, const GstCaps2 *sink)
gst_autoplug_caps_intersect (const GstCaps *src, const GstCaps *sink)
{
GstCaps2 *caps;
GstCaps *caps;
/* if there are no caps, we can link */
if ((src == NULL) && (sink == NULL))
return TRUE;
/* get an intersection */
caps = gst_caps2_intersect (src, sink);
caps = gst_caps_intersect (src, sink);
/* if the caps can't link, there is no intersection */
if (caps == NULL)
return FALSE;
/* hurrah, we can link, now remove the intersection */
gst_caps2_free (caps);
gst_caps_free (caps);
return TRUE;
}
......@@ -88,7 +88,7 @@ gst_autoplug_caps_intersect (const GstCaps2 *src, const GstCaps2 *sink)
* Returns: #GstPadTemplate that can connect to the given caps
*/
GstPadTemplate *
gst_autoplug_can_connect_src (GstElementFactory *fac, const GstCaps2 *src)
gst_autoplug_can_connect_src (GstElementFactory *fac, const GstCaps *src)
{
GList *templs;
......@@ -117,7 +117,7 @@ gst_autoplug_can_connect_src (GstElementFactory *fac, const GstCaps2 *src)
* Returns: #GstPadTemplate that can connect to the given caps
*/
GstPadTemplate *
gst_autoplug_can_connect_sink (GstElementFactory *fac, const GstCaps2 *sink)
gst_autoplug_can_connect_sink (GstElementFactory *fac, const GstCaps *sink)
{
GList *templs;
......@@ -125,7 +125,7 @@ gst_autoplug_can_connect_sink (GstElementFactory *fac, const GstCaps2 *sink)
while (templs)
{
GstCaps2 *caps = GST_PAD_TEMPLATE_CAPS (templs->data);
GstCaps *caps = GST_PAD_TEMPLATE_CAPS (templs->data);
if ((GST_PAD_TEMPLATE_DIRECTION (templs->data) == GST_PAD_SRC) &&
gst_autoplug_caps_intersect (caps, sink))
{
......@@ -320,8 +320,8 @@ gst_autoplug_factories_at_most_templates(GList *factories, GstPadDirection dir,
*/
/**
* gst_autoplug_sp:
* @src_caps: a #GstCaps2 to plug from.
* @sink_caps: the #GstCaps2 to plug to.
* @src_caps: a #GstCaps to plug from.
* @sink_caps: the #GstCaps to plug to.
* @factories: a #GList containing all allowed #GstElementFactory entries.
*
* Finds the shortest path of elements that together make up a possible
......@@ -331,7 +331,7 @@ gst_autoplug_factories_at_most_templates(GList *factories, GstPadDirection dir,
* to get the shortest path.
*/
GList *
gst_autoplug_sp (const GstCaps2 *srccaps, const GstCaps2 *sinkcaps, GList *factories)
gst_autoplug_sp (const GstCaps *srccaps, const GstCaps *sinkcaps, GList *factories)
{
GList *factory_nodes = NULL;
guint curcost = GST_AUTOPLUG_MAX_COST; /* below this cost, there is no path */
......@@ -341,7 +341,7 @@ gst_autoplug_sp (const GstCaps2 *srccaps, const GstCaps2 *sinkcaps, GList *facto
g_return_val_if_fail (sinkcaps != NULL, NULL);
GST_INFO ("attempting to autoplug via shortest path from %s to %s",
gst_caps2_to_string(srccaps), gst_caps2_to_string(sinkcaps));
gst_caps_to_string(srccaps), gst_caps_to_string(sinkcaps));
/* wrap all factories as GstAutoplugNode
* initialize the cost */
......
......@@ -40,9 +40,9 @@ struct _GstAutoplugNode {
};
/* helper functions */
gboolean gst_autoplug_caps_intersect (const GstCaps2 *src, const GstCaps2 *sink);
GstPadTemplate * gst_autoplug_can_connect_src (GstElementFactory *fac, const GstCaps2 *src);
GstPadTemplate * gst_autoplug_can_connect_sink (GstElementFactory *fac, const GstCaps2 *sink);
gboolean gst_autoplug_caps_intersect (const GstCaps *src, const GstCaps *sink);
GstPadTemplate * gst_autoplug_can_connect_src (GstElementFactory *fac, const GstCaps *src);
GstPadTemplate * gst_autoplug_can_connect_sink (GstElementFactory *fac, const GstCaps *sink);
GstPadTemplate * gst_autoplug_can_match (GstElementFactory *src, GstElementFactory *dest);
gboolean gst_autoplug_factory_has_direction (GstElementFactory *fac, GstPadDirection dir);
#define gst_autoplug_factory_has_sink(fac) gst_autoplug_factory_has_direction((fac), GST_PAD_SINK)
......@@ -59,6 +59,6 @@ GList * gst_autoplug_factories_filters_with_sink_caps(GList *factories);
GList * gst_autoplug_factories_at_most_templates(GList *factories, GstPadDirection dir, guint maxtemplates);
/* shortest path algorithm */
GList * gst_autoplug_sp (const GstCaps2 *src_caps, const GstCaps2 *sink_caps, GList *factories);
GList * gst_autoplug_sp (const GstCaps *src_caps, const GstCaps *sink_caps, GList *factories);
#endif /* __GST_SEARCHFUNCS_H__ */
......@@ -70,7 +70,7 @@ GST_STATIC_PAD_TEMPLATE (
"src_%d",
GST_PAD_SRC,
GST_PAD_REQUEST,
GST_STATIC_CAPS2_ANY
GST_STATIC_CAPS_ANY
);
/* standard GObject stuff */
......
......@@ -46,7 +46,7 @@ GST_STATIC_PAD_TEMPLATE (
"src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
GST_STATIC_CAPS2_ANY
GST_STATIC_CAPS_ANY
);
static GstStaticPadTemplate spider_sink_factory =
......@@ -54,7 +54,7 @@ GST_STATIC_PAD_TEMPLATE (
"sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS2_ANY
GST_STATIC_CAPS_ANY
);
/* SpiderIdentity signals and args */
......@@ -75,8 +75,8 @@ static void gst_spider_identity_init (GstSpiderIdentity *spider_identity);
/* functions set in pads, elements and stuff */
static void gst_spider_identity_chain (GstPad *pad, GstBuffer *buf);
static GstElementStateReturn gst_spider_identity_change_state (GstElement *element);
static GstPadLinkReturn gst_spider_identity_link (GstPad *pad, const GstCaps2 *caps);
static GstCaps2 * gst_spider_identity_getcaps (GstPad *pad);
static GstPadLinkReturn gst_spider_identity_link (GstPad *pad, const GstCaps *caps);
static GstCaps * gst_spider_identity_getcaps (GstPad *pad);
/* loop functions */
static void gst_spider_identity_dumb_loop (GstSpiderIdentity *ident);
static void gst_spider_identity_src_loop (GstSpiderIdentity *ident);
......@@ -222,7 +222,7 @@ gst_spider_identity_new_sink (gchar *name)
/* shamelessly stolen from gstqueue.c to get proxy links */
static GstPadLinkReturn
gst_spider_identity_link (GstPad *pad, const GstCaps2 *caps)
gst_spider_identity_link (GstPad *pad, const GstCaps *caps)
{
GstSpiderIdentity *spider_identity = GST_SPIDER_IDENTITY (gst_pad_get_parent (pad));
GstPad *otherpad;
......@@ -238,7 +238,7 @@ gst_spider_identity_link (GstPad *pad, const GstCaps2 *caps)
return GST_PAD_LINK_OK;
}
static GstCaps2*
static GstCaps*
gst_spider_identity_getcaps (GstPad *pad)
{
GstSpiderIdentity *spider_identity = GST_SPIDER_IDENTITY (gst_pad_get_parent (pad));
......@@ -256,7 +256,7 @@ gst_spider_identity_getcaps (GstPad *pad)
if (peer)
return gst_pad_get_caps (peer);
}
return gst_caps2_new_any ();
return gst_caps_new_any ();
}
GstPad*
......@@ -411,7 +411,7 @@ gst_spider_identity_src_loop (GstSpiderIdentity *ident)
typedef struct {
GstBuffer *buffer;
guint best_probability;
GstCaps2 *caps;
GstCaps *caps;
} SpiderTypeFind;
guint8 *
spider_find_peek (gpointer data, gint64 offset, guint size)
......@@ -429,16 +429,16 @@ spider_find_peek (gpointer data, gint64 offset, guint size)
}
}
static void
spider_find_suggest (gpointer data, guint probability, const GstCaps2 *caps)
spider_find_suggest (gpointer data, guint probability, const GstCaps *caps)
{
SpiderTypeFind *find = (SpiderTypeFind *) data;
G_GNUC_UNUSED gchar *caps_str;
caps_str = gst_caps2_to_string (caps);
caps_str = gst_caps_to_string (caps);
GST_INFO ("suggest %u, %s", probability, caps_str);
g_free (caps_str);
if (probability > find->best_probability) {
gst_caps2_replace (&find->caps, gst_caps2_copy (caps));
gst_caps_replace (&find->caps, gst_caps_copy (caps));
find->best_probability = probability;
}
}
......@@ -500,8 +500,8 @@ end:
plug:
GST_INFO ("typefind function found caps");
g_assert (gst_pad_try_set_caps (ident->src, find.caps) > 0);
gst_caps2_debug (find.caps, "spider starting caps");
gst_caps2_free (find.caps);
gst_caps_debug (find.caps, "spider starting caps");
gst_caps_free (find.caps);
if (type_list)
g_list_free (type_list);
......
......@@ -53,7 +53,7 @@ struct _GstSpiderIdentity {
gboolean plugged;
/* Caps from typefinding */
GstCaps2 *caps;
GstCaps *caps;
};
......
......@@ -55,7 +55,7 @@ GstStaticPadTemplate aggregator_src_template = GST_STATIC_PAD_TEMPLATE (
"sink%d",
GST_PAD_SINK,
GST_PAD_REQUEST,
GST_STATIC_CAPS2_ANY
GST_STATIC_CAPS_ANY
);
#define GST_TYPE_AGGREGATOR_SCHED (gst_aggregator_sched_get_type())
......
......@@ -60,7 +60,7 @@ GstStaticPadTemplate fakesink_sink_template = GST_STATIC_PAD_TEMPLATE (
"sink%d",
GST_PAD_SINK,
GST_PAD_REQUEST,
GST_STATIC_CAPS2_ANY
GST_STATIC_CAPS_ANY
);
#define GST_TYPE_FAKESINK_STATE_ERROR (gst_fakesink_state_error_get_type())
......
......@@ -77,7 +77,7 @@ GstStaticPadTemplate fakesrc_src_template = GST_STATIC_PAD_TEMPLATE (
"src%d",
GST_PAD_SRC,
GST_PAD_REQUEST,
GST_STATIC_CAPS2_ANY
GST_STATIC_CAPS_ANY
);
#define GST_TYPE_FAKESRC_OUTPUT (gst_fakesrc_output_get_type())
......
......@@ -152,7 +152,7 @@ gst_identity_class_init (GstIdentityClass *klass)
gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_identity_get_property);
}
static GstCaps2*
static GstCaps*
gst_identity_getcaps (GstPad *pad)
{
GstIdentity *identity;
......@@ -171,20 +171,20 @@ gst_identity_getcaps (GstPad *pad)
if (peer) {
return gst_pad_get_caps (peer);
} else {
return gst_caps2_new_any ();
return gst_caps_new_any ();
}
}
static GstPadLinkReturn
gst_identity_link (GstPad *pad, const GstCaps2 *caps)
gst_identity_link (GstPad *pad, const GstCaps *caps)
{
GstIdentity *identity;
identity = GST_IDENTITY (gst_pad_get_parent (pad));
if (gst_caps2_is_fixed (caps)) {
if (gst_caps_is_fixed (caps)) {
if (identity->delay_capsnego && GST_PAD_IS_SINK (pad)) {
identity->srccaps = gst_caps2_copy (caps);
identity->srccaps = gst_caps_copy (caps);
return GST_PAD_LINK_OK;
}
......
......@@ -59,7 +59,7 @@ struct _GstIdentity {
gboolean dump;
gchar *last_message;
gboolean delay_capsnego;
GstCaps2 *srccaps;
GstCaps *srccaps;
};
struct _GstIdentityClass {
......
......@@ -58,7 +58,7 @@ GstStaticPadTemplate md5_sink_template = GST_STATIC_PAD_TEMPLATE (
"sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS2_ANY
GST_STATIC_CAPS_ANY
);
/* GObject stuff */
......
......@@ -64,14 +64,14 @@ GstStaticPadTemplate shaper_src_template = GST_STATIC_PAD_TEMPLATE (
"src%d",
GST_PAD_SRC,
GST_PAD_SOMETIMES,
GST_STATIC_CAPS2_ANY
GST_STATIC_CAPS_ANY
);
GstStaticPadTemplate shaper_sink_template = GST_STATIC_PAD_TEMPLATE (
"sink%d",
GST_PAD_SINK,
GST_PAD_REQUEST,
GST_STATIC_CAPS2_ANY
GST_STATIC_CAPS_ANY
);
#define GST_TYPE_SHAPER_POLICY (gst_shaper_policy_get_type())
......@@ -170,7 +170,7 @@ gst_shaper_class_init (GstShaperClass *klass)
gstelement_class->request_new_pad = GST_DEBUG_FUNCPTR (gst_shaper_request_new_pad);
}
static GstCaps2*
static GstCaps*
gst_shaper_getcaps (GstPad *pad)
{
GstPad *otherpad;
......@@ -180,7 +180,7 @@ gst_shaper_getcaps (GstPad *pad)
otherpad = (pad == connection->srcpad ? connection->sinkpad : connection->srcpad);
return gst_caps2_copy (gst_pad_get_allowed_caps (otherpad));
return gst_caps_copy (gst_pad_get_allowed_caps (otherpad));
}
static GList*
......@@ -200,7 +200,7 @@ gst_shaper_get_internal_link (GstPad *pad)
}
static GstPadLinkReturn
gst_shaper_link (GstPad *pad, const GstCaps2 *caps)
gst_shaper_link (GstPad *pad, const GstCaps *caps)
{
GstPad *otherpad;
GstShaperConnection *connection;
......
......@@ -57,7 +57,7 @@ GstStaticPadTemplate tee_src_template = GST_STATIC_PAD_TEMPLATE (
"src%d",
GST_PAD_SRC,
GST_PAD_REQUEST,
GST_STATIC_CAPS2_ANY
GST_STATIC_CAPS_ANY
);
static void gst_tee_base_init (gpointer g_class);
......@@ -138,17 +138,17 @@ gst_tee_class_init (GstTeeClass *klass)
}
static GstPadLinkReturn
gst_tee_sinklink (GstPad *pad, const GstCaps2 *caps)
gst_tee_sinklink (GstPad *pad, const GstCaps *caps)
{
GstTee *tee;
const GList *pads;
GstPadLinkReturn set_retval;
GST_DEBUG ( "gst_tee_sinklink caps=%s", gst_caps2_to_string(caps));
GST_DEBUG ( "gst_tee_sinklink caps=%s", gst_caps_to_string(caps));
tee = GST_TEE (gst_pad_get_parent (pad));
if (!gst_caps2_is_fixed (caps)) {
if (!gst_caps_is_fixed (caps)) {
return GST_PAD_LINK_DELAYED;
}
......@@ -170,21 +170,21 @@ gst_tee_sinklink (GstPad *pad, const GstCaps2 *caps)
}
static GstPadLinkReturn
gst_tee_srclink (GstPad *pad, const GstCaps2 *caps)
gst_tee_srclink (GstPad *pad, const GstCaps *caps)
{
GstTee *tee;
GST_DEBUG ( "gst_tee_srclink caps=%s", gst_caps2_to_string(caps));
GST_DEBUG ( "gst_tee_srclink caps=%s", gst_caps_to_string(caps));
tee = GST_TEE (gst_pad_get_parent (pad));
return gst_pad_proxy_link (tee->sinkpad, caps);
}
static GstCaps2*
static GstCaps*
gst_tee_getcaps (GstPad *pad)
{
GstCaps2 *caps = GST_CAPS2_ANY;
GstCaps *caps = GST_CAPS_ANY;
GstTee *tee;
const GList *pads;
......@@ -197,8 +197,8 @@ gst_tee_getcaps (GstPad *pad)
while (pads) {
GstPad *srcpad = GST_PAD (pads->data);
GstPad *peer;
const GstCaps2 *peercaps;
GstCaps2 *newcaps;
const GstCaps *peercaps;
GstCaps *newcaps;
pads = g_list_next (pads);
......@@ -208,8 +208,8 @@ gst_tee_getcaps (GstPad *pad)
}
peercaps = gst_pad_get_caps (peer);
newcaps = gst_caps2_intersect (caps, peercaps);
gst_caps2_free (caps);
newcaps = gst_caps_intersect (caps, peercaps);
gst_caps_free (caps);
caps = newcaps;
}
......
......@@ -58,14 +58,14 @@ GstStaticPadTemplate type_find_element_sink_template = GST_STATIC_PAD_TEMPLATE (
"sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS2_ANY
GST_STATIC_CAPS_ANY
);
GstStaticPadTemplate type_find_element_src_template = GST_STATIC_PAD_TEMPLATE (
"src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
GST_STATIC_CAPS2_ANY
GST_STATIC_CAPS_ANY
);
/* TypeFind signals and args */
......@@ -141,17 +141,17 @@ gst_type_find_element_get_type (void)
return typefind_type;
}
static void
gst_type_find_element_have_type (GstTypeFindElement *typefind, guint probability, GstCaps2 *caps)
gst_type_find_element_have_type (GstTypeFindElement *typefind, guint probability, GstCaps *caps)
{
gchar *caps_str;
g_assert (typefind->caps == NULL);
g_assert (caps != NULL);
caps_str = gst_caps2_to_string (caps);
caps_str = gst_caps_to_string (caps);
GST_INFO_OBJECT (typefind, "found caps %s", caps_str);
g_free (caps_str);
gst_caps2_replace (&typefind->caps, caps);
gst_caps_replace (&typefind->caps, caps);
if (gst_pad_try_set_caps (typefind->src, caps) < GST_PAD_LINK_OK) {
gst_element_error (GST_ELEMENT (typefind), "could not set caps on source pad");
}
......@@ -184,7 +184,7 @@ gst_type_find_element_class_init (gpointer g_class, gpointer class_data)
g_object_class_install_property (gobject_class, ARG_CAPS,
g_param_spec_boxed ("caps", _("caps"), _("detected capabilities in stream"),
gst_caps2_get_type(), G_PARAM_READABLE));
gst_caps_get_type(), G_PARAM_READABLE));
g_object_class_install_property (gobject_class, ARG_MINIMUM,
g_param_spec_uint ("minimum", _("minimum"), "minimum probability required to accept caps",
GST_TYPE_FIND_MINIMUM, GST_TYPE_FIND_MAXIMUM, GST_TYPE_FIND_MINIMUM, G_PARAM_READWRITE));
......@@ -196,7 +196,7 @@ gst_type_find_element_class_init (gpointer g_class, gpointer class_data)
G_TYPE_FROM_CLASS (g_class), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstTypeFindElementClass, have_type), NULL, NULL,
gst_marshal_VOID__UINT_BOXED, G_TYPE_NONE, 2,
G_TYPE_UINT, gst_caps2_get_type());
G_TYPE_UINT, gst_caps_get_type());
gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_type_find_element_change_state);
}
......@@ -313,7 +313,7 @@ gst_type_find_element_src_event (GstPad *pad, GstEvent *event)
typedef struct {
GstTypeFindFactory * factory;
gint probability;
GstCaps2 * caps;
GstCaps * caps;
gint64 requested_offset;
guint requested_size;
......@@ -333,7 +333,7 @@ free_entry (TypeFindEntry *entry)
free_entry_buffers (entry);
if (entry->caps)
gst_caps2_free (entry->caps);
gst_caps_free (entry->caps);
g_free (entry);
}
static void
......@@ -473,18 +473,18 @@ find_peek (gpointer data, gint64 offset, guint size)
}
}
static void
find_suggest (gpointer data, guint probability, const GstCaps2 *caps)
find_suggest (gpointer data, guint probability, const GstCaps *caps)
{
gchar *str;
TypeFindEntry *entry = (TypeFindEntry *) data;
str = gst_caps2_to_string (caps);
str = gst_caps_to_string (caps);
GST_LOG_OBJECT (entry->self, "'%s' called suggest (%u, %s)",
GST_PLUGIN_FEATURE_NAME (entry->factory), probability, str);
g_free (str);
if (((gint) probability) > entry->probability) {
entry->probability = probability;
gst_caps2_replace (&entry->caps, gst_caps2_copy (caps));
gst_caps_replace (&entry->caps, gst_caps_copy (caps));
}
}
static gint
......@@ -563,10 +563,10 @@ gst_type_find_element_chain (GstPad *pad, GstData *data)
free_entry (entry);
} else if (entry->probability >= typefind->max_probability) {
/* wooha, got caps */
GstCaps2 *found_caps = entry->caps;
GstCaps *found_caps = entry->caps;
guint probability = entry->probability;
found_caps = gst_caps2_copy (found_caps);
found_caps = gst_caps_copy (found_caps);
GST_INFO_OBJECT (typefind, "'%s' returned %u/%u probability, using it NOW",
GST_PLUGIN_FEATURE_NAME (entry->factory), probability, typefind->max_probability);
while (walk) {
......@@ -581,7 +581,7 @@ gst_type_find_element_chain (GstPad *pad, GstData *data)
typefind->possibilities = NULL;
g_list_free (typefind->possibilities);
g_signal_emit (typefind, gst_type_find_element_signals[HAVE_TYPE], 0, probability, found_caps);
gst_caps2_free (found_caps);
gst_caps_free (found_caps);
} else {
typefind->possibilities = g_list_prepend (typefind->possibilities, entry);
}
......@@ -669,7 +669,7 @@ gst_type_find_element_change_state (GstElement *element)
break;
case GST_STATE_PAUSED_TO_READY:
stop_typefinding (typefind);
gst_caps2_replace (&typefind->caps, NULL);
gst_caps_replace (&typefind->caps, NULL);
break;
default:
break;
......
......@@ -50,7 +50,7 @@ struct _GstTypeFindElement {
guint min_probability;
guint max_probability;
GstCaps2 * caps;
GstCaps * caps;
guint mode;
GstBufferStore * store;
......@@ -66,7 +66,7 @@ struct _GstTypeFindElementClass {
/* signals */
void (*have_type) (GstTypeFindElement *element,
guint probability,
GstCaps2 * caps);
GstCaps * caps);
};
GType gst_type_find_element_get_type (void);
......
......@@ -58,14 +58,14 @@ GstStaticPadTemplate type_find_element_sink_template = GST_STATIC_PAD_TEMPLATE (
"sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS2_ANY
GST_STATIC_CAPS_ANY
);
GstStaticPadTemplate type_find_element_src_template = GST_STATIC_PAD_TEMPLATE (
"src",
GST_PAD_SRC,