diff options
author | David Schleef <ds@schleef.org> | 2003-12-21 23:24:38 +0000 |
---|---|---|
committer | David Schleef <ds@schleef.org> | 2003-12-21 23:24:38 +0000 |
commit | 8284d0d3a2911a9ef9667aa52f0fd42e4c93405f (patch) | |
tree | 5fa53a115231b29afd0bc832f9c32afdd8dd51c7 /gst-libs/gst/audio | |
parent | 26da56b423a834192f5edf413c3cb1be257f845a (diff) | |
download | gst-plugins-bad-8284d0d3a2911a9ef9667aa52f0fd42e4c93405f.tar.gz gst-plugins-bad-8284d0d3a2911a9ef9667aa52f0fd42e4c93405f.tar.bz2 gst-plugins-bad-8284d0d3a2911a9ef9667aa52f0fd42e4c93405f.zip |
Original commit message from CVS:
Global change from "caps2" to "caps"
Diffstat (limited to 'gst-libs/gst/audio')
-rw-r--r-- | gst-libs/gst/audio/audio.c | 16 | ||||
-rw-r--r-- | gst-libs/gst/audio/gstaudiofilter.c | 20 | ||||
-rw-r--r-- | gst-libs/gst/audio/gstaudiofilter.h | 4 |
3 files changed, 20 insertions, 20 deletions
diff --git a/gst-libs/gst/audio/audio.c b/gst-libs/gst/audio/audio.c index f3c85a59..bec298e9 100644 --- a/gst-libs/gst/audio/audio.c +++ b/gst-libs/gst/audio/audio.c @@ -35,7 +35,7 @@ gst_audio_frame_byte_size (GstPad* pad) int width = 0; int channels = 0; - GstCaps2 *caps; + GstCaps *caps; GstStructure *structure; /* get caps of pad */ @@ -48,7 +48,7 @@ gst_audio_frame_byte_size (GstPad* pad) return 0; } - structure = gst_caps2_get_nth_cap (caps, 0); + structure = gst_caps_get_structure (caps, 0); gst_structure_get_int (structure, "width", &width); gst_structure_get_int (structure, "channels", &channels); @@ -82,7 +82,7 @@ gst_audio_frame_rate (GstPad *pad) * returns 0 if failed, rate if success */ { - GstCaps2 *caps = NULL; + GstCaps *caps = NULL; gint rate; GstStructure *structure; @@ -96,7 +96,7 @@ gst_audio_frame_rate (GstPad *pad) return 0; } else { - structure = gst_caps2_get_nth_cap (caps, 0); + structure = gst_caps_get_structure (caps, 0); gst_structure_get_int (structure, "rate", &rate); return rate; } @@ -117,7 +117,7 @@ gst_audio_length (GstPad* pad, GstBuffer* buf) double length; - GstCaps2 *caps = NULL; + GstCaps *caps = NULL; GstStructure *structure; g_assert (GST_IS_BUFFER (buf)); @@ -132,7 +132,7 @@ gst_audio_length (GstPad* pad, GstBuffer* buf) } else { - structure = gst_caps2_get_nth_cap (caps, 0); + structure = gst_caps_get_structure (caps, 0); bytes = GST_BUFFER_SIZE (buf); gst_structure_get_int (structure, "width", &width); gst_structure_get_int (structure, "channels", &channels); @@ -156,7 +156,7 @@ gst_audio_highest_sample_value (GstPad* pad) { gboolean is_signed = FALSE; gint width = 0; - GstCaps2 *caps = NULL; + GstCaps *caps = NULL; GstStructure *structure; caps = GST_PAD_CAPS (pad); @@ -166,7 +166,7 @@ gst_audio_highest_sample_value (GstPad* pad) GST_ELEMENT_NAME (gst_pad_get_parent (pad)), GST_PAD_NAME (pad)); } - structure = gst_caps2_get_nth_cap (caps, 0); + structure = gst_caps_get_structure (caps, 0); gst_structure_get_int (structure, "width", &width); gst_structure_get_boolean (structure, "signed", &is_signed); diff --git a/gst-libs/gst/audio/gstaudiofilter.c b/gst-libs/gst/audio/gstaudiofilter.c index adbb9748..46e7c7de 100644 --- a/gst-libs/gst/audio/gstaudiofilter.c +++ b/gst-libs/gst/audio/gstaudiofilter.c @@ -48,7 +48,7 @@ static void gst_audiofilter_set_property (GObject *object, guint prop_id, const static void gst_audiofilter_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); static void gst_audiofilter_chain (GstPad *pad, GstData *_data); -GstCaps2 * gst_audiofilter_class_get_capslist(GstAudiofilterClass *klass); +GstCaps * gst_audiofilter_class_get_capslist(GstAudiofilterClass *klass); static GstElementClass *parent_class = NULL; @@ -105,11 +105,11 @@ static void gst_audiofilter_class_init (gpointer g_class, gpointer class_data) gobject_class->get_property = gst_audiofilter_get_property; } -static GstCaps2 * +static GstCaps * gst_audiofilter_getcaps (GstPad *pad) { GstAudiofilter *audiofilter; - GstCaps2 *othercaps; + GstCaps *othercaps; GstAudiofilterClass *audiofilter_class; GST_DEBUG("gst_audiofilter_sink_getcaps"); @@ -124,11 +124,11 @@ gst_audiofilter_getcaps (GstPad *pad) othercaps = gst_pad_get_allowed_caps (audiofilter->srcpad); } - return gst_caps2_intersect (othercaps, audiofilter_class->caps); + return gst_caps_intersect (othercaps, audiofilter_class->caps); } static GstPadLinkReturn -gst_audiofilter_link (GstPad *pad, const GstCaps2 *caps) +gst_audiofilter_link (GstPad *pad, const GstCaps *caps) { GstAudiofilter *audiofilter; GstPadLinkReturn ret; @@ -150,7 +150,7 @@ gst_audiofilter_link (GstPad *pad, const GstCaps2 *caps) if (link_ret != GST_PAD_LINK_OK) return link_ret; - structure = gst_caps2_get_nth_cap (caps, 0); + structure = gst_caps_get_structure (caps, 0); if (strcmp (gst_structure_get_name (structure), "audio/x-raw-int") == 0) { ret = gst_structure_get_int (structure, "depth", &audiofilter->depth); @@ -287,19 +287,19 @@ gst_audiofilter_get_property (GObject *object, guint prop_id, GValue *value, GPa } void gst_audiofilter_class_add_pad_templates ( - GstAudiofilterClass *audiofilter_class, const GstCaps2 *caps) + GstAudiofilterClass *audiofilter_class, const GstCaps *caps) { GstElementClass *element_class = GST_ELEMENT_CLASS (audiofilter_class); - audiofilter_class->caps = gst_caps2_copy(caps); + audiofilter_class->caps = gst_caps_copy(caps); gst_element_class_add_pad_template (element_class, gst_pad_template_new("src", GST_PAD_SRC, GST_PAD_ALWAYS, - gst_caps2_copy(caps))); + gst_caps_copy(caps))); gst_element_class_add_pad_template (element_class, gst_pad_template_new("sink", GST_PAD_SINK, GST_PAD_ALWAYS, - gst_caps2_copy(caps))); + gst_caps_copy(caps))); } static gboolean diff --git a/gst-libs/gst/audio/gstaudiofilter.h b/gst-libs/gst/audio/gstaudiofilter.h index f5bb7eaa..4723c329 100644 --- a/gst-libs/gst/audio/gstaudiofilter.h +++ b/gst-libs/gst/audio/gstaudiofilter.h @@ -68,7 +68,7 @@ struct _GstAudiofilter { struct _GstAudiofilterClass { GstElementClass parent_class; - GstCaps2 *caps; + GstCaps *caps; GstAudiofilterSetupFunc setup; GstAudiofilterInplaceFilterFunc filter_inplace; GstAudiofilterFilterFunc filter; @@ -76,7 +76,7 @@ struct _GstAudiofilterClass { GType gst_audiofilter_get_type(void); -void gst_audiofilter_class_add_pad_templates (GstAudiofilterClass *audiofilterclass, const GstCaps2 *caps); +void gst_audiofilter_class_add_pad_templates (GstAudiofilterClass *audiofilterclass, const GstCaps *caps); G_END_DECLS |