diff --git a/tests/old/testsuite/bytestream/gstbstest.c b/tests/old/testsuite/bytestream/gstbstest.c index baee3cc1f5..99a943495d 100644 --- a/tests/old/testsuite/bytestream/gstbstest.c +++ b/tests/old/testsuite/bytestream/gstbstest.c @@ -160,22 +160,20 @@ gst_bstest_class_init (GstBsTestClass * klass) } -static GstPadNegotiateReturn +static GstPadConnectReturn gst_bstest_negotiate_src (GstPad * pad, GstCaps ** caps, gpointer * data) { - GstBsTest *bstest; + GstBsTest *bstest = GST_BSTEST (gst_pad_get_parent (pad)); - bstest = GST_BSTEST (gst_pad_get_parent (pad)); - - return gst_pad_negotiate_proxy (pad, bstest->sinkpad, caps); + /* thomas: I was trying to fix this old test, one of these two pads + * needs to be dropped according to the new api, which one ? */ + return gst_pad_proxy_connect (pad, bstest->sinkpad, caps); } -static GstPadNegotiateReturn +static GstPadConnectReturn gst_bstest_negotiate_sink (GstPad * pad, GstCaps ** caps, gpointer * data) { - GstBsTest *bstest; - - bstest = GST_BSTEST (gst_pad_get_parent (pad)); + GstBsTest *bstest = GST_BSTEST (gst_pad_get_parent (pad)); return gst_pad_negotiate_proxy (pad, bstest->srcpad, caps); } diff --git a/tests/old/testsuite/bytestream/test1.c b/tests/old/testsuite/bytestream/test1.c index c7652bcf0f..8fb8436dc3 100644 --- a/tests/old/testsuite/bytestream/test1.c +++ b/tests/old/testsuite/bytestream/test1.c @@ -185,12 +185,9 @@ main (int argc, char *argv[]) bs = gst_element_factory_make ("bstest", "bs"); g_assert (bs); - gst_element_connect (src, "src", bs, "sink"); - gst_element_connect (bs, "src", sink, "sink"); + gst_element_connect_many (src, bs, sink); - gst_bin_add (GST_BIN (pipeline), src); - gst_bin_add (GST_BIN (pipeline), bs); - gst_bin_add (GST_BIN (pipeline), sink); + gst_bin_add_many (GST_BIN (pipeline), src, bs, sink); walk = params; diff --git a/testsuite/bytestream/gstbstest.c b/testsuite/bytestream/gstbstest.c index baee3cc1f5..99a943495d 100644 --- a/testsuite/bytestream/gstbstest.c +++ b/testsuite/bytestream/gstbstest.c @@ -160,22 +160,20 @@ gst_bstest_class_init (GstBsTestClass * klass) } -static GstPadNegotiateReturn +static GstPadConnectReturn gst_bstest_negotiate_src (GstPad * pad, GstCaps ** caps, gpointer * data) { - GstBsTest *bstest; + GstBsTest *bstest = GST_BSTEST (gst_pad_get_parent (pad)); - bstest = GST_BSTEST (gst_pad_get_parent (pad)); - - return gst_pad_negotiate_proxy (pad, bstest->sinkpad, caps); + /* thomas: I was trying to fix this old test, one of these two pads + * needs to be dropped according to the new api, which one ? */ + return gst_pad_proxy_connect (pad, bstest->sinkpad, caps); } -static GstPadNegotiateReturn +static GstPadConnectReturn gst_bstest_negotiate_sink (GstPad * pad, GstCaps ** caps, gpointer * data) { - GstBsTest *bstest; - - bstest = GST_BSTEST (gst_pad_get_parent (pad)); + GstBsTest *bstest = GST_BSTEST (gst_pad_get_parent (pad)); return gst_pad_negotiate_proxy (pad, bstest->srcpad, caps); } diff --git a/testsuite/bytestream/test1.c b/testsuite/bytestream/test1.c index c7652bcf0f..8fb8436dc3 100644 --- a/testsuite/bytestream/test1.c +++ b/testsuite/bytestream/test1.c @@ -185,12 +185,9 @@ main (int argc, char *argv[]) bs = gst_element_factory_make ("bstest", "bs"); g_assert (bs); - gst_element_connect (src, "src", bs, "sink"); - gst_element_connect (bs, "src", sink, "sink"); + gst_element_connect_many (src, bs, sink); - gst_bin_add (GST_BIN (pipeline), src); - gst_bin_add (GST_BIN (pipeline), bs); - gst_bin_add (GST_BIN (pipeline), sink); + gst_bin_add_many (GST_BIN (pipeline), src, bs, sink); walk = params;