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 /ext/gsm | |
| 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 'ext/gsm')
| -rw-r--r-- | ext/gsm/gstgsmdec.c | 8 | ||||
| -rw-r--r-- | ext/gsm/gstgsmenc.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ext/gsm/gstgsmdec.c b/ext/gsm/gstgsmdec.c index 7a35b155..1359ce97 100644 --- a/ext/gsm/gstgsmdec.c +++ b/ext/gsm/gstgsmdec.c @@ -49,7 +49,7 @@ static void gst_gsmdec_class_init (GstGSMDec *klass); static void gst_gsmdec_init (GstGSMDec *gsmdec); static void gst_gsmdec_chain (GstPad *pad, GstData *_data); -static GstPadLinkReturn gst_gsmdec_sinkconnect (GstPad *pad, const GstCaps2 *caps); +static GstPadLinkReturn gst_gsmdec_sinkconnect (GstPad *pad, const GstCaps *caps); static GstElementClass *parent_class = NULL; /*static guint gst_gsmdec_signals[LAST_SIGNAL] = { 0 }; */ @@ -146,7 +146,7 @@ gst_gsmdec_init (GstGSMDec *gsmdec) } static GstPadLinkReturn -gst_gsmdec_sinkconnect (GstPad *pad, const GstCaps2 *caps) +gst_gsmdec_sinkconnect (GstPad *pad, const GstCaps *caps) { GstGSMDec *gsmdec; gint rate; @@ -154,11 +154,11 @@ gst_gsmdec_sinkconnect (GstPad *pad, const GstCaps2 *caps) gsmdec = GST_GSMDEC (gst_pad_get_parent (pad)); - structure = gst_caps2_get_nth_cap (caps, 0); + structure = gst_caps_get_structure (caps, 0); gst_structure_get_int (structure, "rate", &rate); if (gst_pad_try_set_caps (gsmdec->srcpad, - gst_caps2_new_simple ("audio/x-raw-int", + gst_caps_new_simple ("audio/x-raw-int", "endianness", G_TYPE_INT, G_BYTE_ORDER, "signed", G_TYPE_BOOLEAN, TRUE, "width", G_TYPE_INT, 16, diff --git a/ext/gsm/gstgsmenc.c b/ext/gsm/gstgsmenc.c index 7158630c..a608fea0 100644 --- a/ext/gsm/gstgsmenc.c +++ b/ext/gsm/gstgsmenc.c @@ -50,7 +50,7 @@ static void gst_gsmenc_class_init (GstGSMEnc *klass); static void gst_gsmenc_init (GstGSMEnc *gsmenc); static void gst_gsmenc_chain (GstPad *pad,GstData *_data); -static GstPadLinkReturn gst_gsmenc_sinkconnect (GstPad *pad, const GstCaps2 *caps); +static GstPadLinkReturn gst_gsmenc_sinkconnect (GstPad *pad, const GstCaps *caps); static GstElementClass *parent_class = NULL; static guint gst_gsmenc_signals[LAST_SIGNAL] = { 0 }; @@ -156,17 +156,17 @@ gst_gsmenc_init (GstGSMEnc *gsmenc) } static GstPadLinkReturn -gst_gsmenc_sinkconnect (GstPad *pad, const GstCaps2 *caps) +gst_gsmenc_sinkconnect (GstPad *pad, const GstCaps *caps) { GstGSMEnc *gsmenc; GstStructure *structure; gsmenc = GST_GSMENC (gst_pad_get_parent (pad)); - structure = gst_caps2_get_nth_cap (caps, 0); + structure = gst_caps_get_structure (caps, 0); gst_structure_get_int (structure, "rate", &gsmenc->rate); if (gst_pad_try_set_caps (gsmenc->srcpad, - gst_caps2_new_simple("audio/x-gsm", + gst_caps_new_simple("audio/x-gsm", "rate", G_TYPE_INT, gsmenc->rate, "channels", G_TYPE_INT, 1, NULL)) > 0) |