summaryrefslogtreecommitdiff
path: root/ext/jack/gstjack.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/jack/gstjack.c')
-rw-r--r--ext/jack/gstjack.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c
index 4ebeded2b..4a987ae17 100644
--- a/ext/jack/gstjack.c
+++ b/ext/jack/gstjack.c
@@ -77,7 +77,7 @@ static GstPadTemplate* gst_jack_sink_request_pad_factory();
static GstPad* gst_jack_request_new_pad (GstElement *element, GstPadTemplate *templ,
const gchar *name);
static GstElementStateReturn gst_jack_change_state (GstElement *element);
-static GstPadLinkReturn gst_jack_link (GstPad *pad, const GstCaps2 *caps);
+static GstPadLinkReturn gst_jack_link (GstPad *pad, const GstCaps *caps);
static void gst_jack_loop (GstElement *element);
@@ -263,8 +263,8 @@ gst_jack_src_request_pad_factory (void)
static GstPadTemplate *template = NULL;
if (!template) {
- GstCaps2 *caps;
- caps = gst_caps2_from_string (GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_CAPS);
+ GstCaps *caps;
+ caps = gst_caps_from_string (GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_CAPS);
template = gst_pad_template_new ("%s", GST_PAD_SRC,
GST_PAD_REQUEST, caps);
}
@@ -278,8 +278,8 @@ gst_jack_sink_request_pad_factory (void)
static GstPadTemplate *template = NULL;
if (!template) {
- GstCaps2 *caps;
- caps = gst_caps2_from_string (GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_CAPS);
+ GstCaps *caps;
+ caps = gst_caps_from_string (GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_CAPS);
template = gst_pad_template_new ("%s", GST_PAD_SINK,
GST_PAD_REQUEST, caps);
}
@@ -349,7 +349,7 @@ gst_jack_change_state (GstElement *element)
GstJack *this;
GList *l = NULL, **pads;
GstJackPad *pad;
- GstCaps2 *caps;
+ GstCaps *caps;
g_return_val_if_fail (element != NULL, FALSE);
this = GST_JACK (element);
@@ -393,7 +393,7 @@ gst_jack_change_state (GstElement *element)
while (l) {
pad = GST_JACK_PAD (l);
caps = gst_pad_get_caps (pad->pad);
- gst_caps2_set_simple (caps,
+ gst_caps_set_simple (caps,
"rate", G_TYPE_INT, (int)this->bin->rate,
"buffer-frames", G_TYPE_INT, (gint)this->bin->nframes,
NULL);
@@ -417,7 +417,7 @@ gst_jack_change_state (GstElement *element)
}
static GstPadLinkReturn
-gst_jack_link (GstPad *pad, const GstCaps2 *caps)
+gst_jack_link (GstPad *pad, const GstCaps *caps)
{
GstJack *this;
gint rate, buffer_frames;
@@ -425,7 +425,7 @@ gst_jack_link (GstPad *pad, const GstCaps2 *caps)
this = GST_JACK (GST_OBJECT_PARENT (pad));
- structure = gst_caps2_get_nth_cap (caps, 0);
+ structure = gst_caps_get_structure (caps, 0);
gst_structure_get_int (structure, "rate", &rate);
gst_structure_get_int (structure, "buffer-frames", &buffer_frames);
if (this->bin && (rate != this->bin->rate ||