diff options
34 files changed, 86 insertions, 86 deletions
diff --git a/examples/events/seek.c b/examples/events/seek.c index b9ce8a1142..4e45f53731 100644 --- a/examples/events/seek.c +++ b/examples/events/seek.c @@ -29,8 +29,8 @@ main (int argc, char *argv[]) sinkpad = gst_element_get_pad (sink, "sink"); g_return_val_if_fail (srcpad != NULL, -1); - g_print ("--- connecting\n"); - gst_pad_connect (srcpad, sinkpad); + g_print ("--- linking\n"); + gst_pad_link (srcpad, sinkpad); g_print ("--- setting up\n"); gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PLAYING); diff --git a/examples/queue2/queue2.c b/examples/queue2/queue2.c index 83c3173ecd..b6eae69d4c 100644 --- a/examples/queue2/queue2.c +++ b/examples/queue2/queue2.c @@ -52,8 +52,8 @@ int main(int argc,char *argv[]) gst_bin_add(GST_BIN(thread), osssink); - gst_pad_connect(gst_element_get_pad(queue,"src"), - gst_element_get_pad(osssink,"sink")); + gst_pad_link(gst_element_get_pad(queue,"src"), + gst_element_get_pad(osssink,"sink")); if (!gst_pipeline_autoplug(GST_PIPELINE(pipeline))) { g_print("cannot autoplug pipeline\n"); diff --git a/tests/old/examples/events/seek.c b/tests/old/examples/events/seek.c index b9ce8a1142..4e45f53731 100644 --- a/tests/old/examples/events/seek.c +++ b/tests/old/examples/events/seek.c @@ -29,8 +29,8 @@ main (int argc, char *argv[]) sinkpad = gst_element_get_pad (sink, "sink"); g_return_val_if_fail (srcpad != NULL, -1); - g_print ("--- connecting\n"); - gst_pad_connect (srcpad, sinkpad); + g_print ("--- linking\n"); + gst_pad_link (srcpad, sinkpad); g_print ("--- setting up\n"); gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PLAYING); diff --git a/tests/old/examples/queue2/queue2.c b/tests/old/examples/queue2/queue2.c index 83c3173ecd..b6eae69d4c 100644 --- a/tests/old/examples/queue2/queue2.c +++ b/tests/old/examples/queue2/queue2.c @@ -52,8 +52,8 @@ int main(int argc,char *argv[]) gst_bin_add(GST_BIN(thread), osssink); - gst_pad_connect(gst_element_get_pad(queue,"src"), - gst_element_get_pad(osssink,"sink")); + gst_pad_link(gst_element_get_pad(queue,"src"), + gst_element_get_pad(osssink,"sink")); if (!gst_pipeline_autoplug(GST_PIPELINE(pipeline))) { g_print("cannot autoplug pipeline\n"); diff --git a/tests/old/testsuite/bytestream/gstbstest.c b/tests/old/testsuite/bytestream/gstbstest.c index 99a943495d..48057031d4 100644 --- a/tests/old/testsuite/bytestream/gstbstest.c +++ b/tests/old/testsuite/bytestream/gstbstest.c @@ -160,17 +160,17 @@ gst_bstest_class_init (GstBsTestClass * klass) } -static GstPadConnectReturn +static GstPadLinkReturn gst_bstest_negotiate_src (GstPad * pad, GstCaps ** caps, gpointer * data) { GstBsTest *bstest = GST_BSTEST (gst_pad_get_parent (pad)); /* 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); + return gst_pad_proxy_link (pad, bstest->sinkpad, caps); } -static GstPadConnectReturn +static GstPadLinkReturn gst_bstest_negotiate_sink (GstPad * pad, GstCaps ** caps, gpointer * data) { GstBsTest *bstest = GST_BSTEST (gst_pad_get_parent (pad)); diff --git a/tests/old/testsuite/bytestream/test1.c b/tests/old/testsuite/bytestream/test1.c index 8fb8436dc3..b086f7246e 100644 --- a/tests/old/testsuite/bytestream/test1.c +++ b/tests/old/testsuite/bytestream/test1.c @@ -185,7 +185,7 @@ main (int argc, char *argv[]) bs = gst_element_factory_make ("bstest", "bs"); g_assert (bs); - gst_element_connect_many (src, bs, sink); + gst_element_link_many (src, bs, sink); gst_bin_add_many (GST_BIN (pipeline), src, bs, sink); diff --git a/tests/old/testsuite/cleanup/cleanup1.c b/tests/old/testsuite/cleanup/cleanup1.c index 3c8ff13d61..d1e0d29857 100644 --- a/tests/old/testsuite/cleanup/cleanup1.c +++ b/tests/old/testsuite/cleanup/cleanup1.c @@ -12,7 +12,7 @@ create_pipeline (void) fakesrc = gst_element_factory_make ("fakesrc", "fakesrc"); fakesink = gst_element_factory_make ("fakesink", "fakesink"); - gst_element_connect (fakesrc, fakesink); + gst_element_link (fakesrc, fakesink); gst_bin_add_many (GST_BIN (pipeline), fakesrc, fakesink, NULL); diff --git a/tests/old/testsuite/cleanup/cleanup2.c b/tests/old/testsuite/cleanup/cleanup2.c index 92e02178d1..5533b3716c 100644 --- a/tests/old/testsuite/cleanup/cleanup2.c +++ b/tests/old/testsuite/cleanup/cleanup2.c @@ -15,7 +15,7 @@ create_pipeline (void) gst_bin_add (GST_BIN (bin), fakesink); gst_element_add_ghost_pad (bin, gst_element_get_pad (fakesink, "sink"), "sink"); - gst_element_connect (fakesrc, bin); + gst_element_link (fakesrc, bin); gst_bin_add_many (GST_BIN (pipeline), fakesrc, bin, NULL); diff --git a/tests/old/testsuite/cleanup/cleanup3.c b/tests/old/testsuite/cleanup/cleanup3.c index 0bf01295c4..cdd102a005 100644 --- a/tests/old/testsuite/cleanup/cleanup3.c +++ b/tests/old/testsuite/cleanup/cleanup3.c @@ -15,10 +15,10 @@ create_pipeline (void) queue = gst_element_factory_make ("queue", "queue"); gst_bin_add (GST_BIN (thread), fakesink); gst_bin_add (GST_BIN (thread), queue); - gst_element_connect (queue, fakesink); + gst_element_link (queue, fakesink); gst_element_add_ghost_pad (thread, gst_element_get_pad (queue, "sink"), "sink"); - gst_element_connect (fakesrc, thread); + gst_element_link (fakesrc, thread); gst_bin_add (GST_BIN (pipeline), fakesrc); gst_bin_add (GST_BIN (pipeline), thread); diff --git a/tests/old/testsuite/cleanup/cleanup4.c b/tests/old/testsuite/cleanup/cleanup4.c index 4d0eb35eeb..d82058b3c7 100644 --- a/tests/old/testsuite/cleanup/cleanup4.c +++ b/tests/old/testsuite/cleanup/cleanup4.c @@ -30,7 +30,7 @@ main (gint argc, gchar *argv[]) fakesink = gst_element_factory_make ("fakesink", "fakesink"); - gst_element_connect (fakesrc, fakesink); + gst_element_link (fakesrc, fakesink); gst_bin_add (GST_BIN (bin), fakesink); gst_bin_add (GST_BIN (pipeline), bin); diff --git a/tests/old/testsuite/clock/clock1.c b/tests/old/testsuite/clock/clock1.c index 7728f53a19..ebce7c85cd 100644 --- a/tests/old/testsuite/clock/clock1.c +++ b/tests/old/testsuite/clock/clock1.c @@ -47,7 +47,7 @@ main (int argc, char *argv[]) return 1; } - gst_element_connect_many (src, id, sink, NULL); + gst_element_link_many (src, id, sink, NULL); gst_bin_add_many (GST_BIN (pipeline), src, id, sink, NULL); clock = gst_bin_get_clock (GST_BIN (pipeline)); diff --git a/tests/old/testsuite/dynparams/dparamstest.c b/tests/old/testsuite/dynparams/dparamstest.c index de921a27e6..0e576f19ff 100644 --- a/tests/old/testsuite/dynparams/dparamstest.c +++ b/tests/old/testsuite/dynparams/dparamstest.c @@ -223,8 +223,8 @@ int main(int argc,char *argv[]) { testelement = gst_element_factory_make ("dptest", "testelement"); g_assert (testelement); - gst_element_connect (src, testelement); - gst_element_connect (testelement, sink); + gst_element_link (src, testelement); + gst_element_link (testelement, sink); gst_bin_add (GST_BIN (pipeline), src); gst_bin_add (GST_BIN (pipeline), testelement); diff --git a/tests/old/testsuite/elements/fake.c b/tests/old/testsuite/elements/fake.c index 9fcba05beb..dcf3504b7a 100644 --- a/tests/old/testsuite/elements/fake.c +++ b/tests/old/testsuite/elements/fake.c @@ -54,14 +54,14 @@ main (int argc, char *argv[]) gst_bin_add (GST_BIN (pipeline), src); gst_bin_add (GST_BIN (pipeline), sink); - /* connect */ - g_print ("Connecting elements\n"); + /* link */ + g_print ("Linking elements\n"); gst_element_set_state (pipeline, GST_STATE_PLAYING); /* we expect this to give an error */ if (gst_bin_iterate (GST_BIN (pipeline)) != FALSE) { - g_warning ("Iterating a bin with unconnected elements should return FALSE !\n"); + g_warning ("Iterating a bin with unlinked elements should return FALSE !\n"); retval = 1; } @@ -75,7 +75,7 @@ main (int argc, char *argv[]) /* we expect this to work */ if (gst_bin_iterate (GST_BIN (pipeline)) != TRUE) { - g_error ("Iterating a bin with connected elements should return TRUE !\n"); + g_error ("Iterating a bin with linked elements should return TRUE !\n"); retval = 1; } diff --git a/tests/old/testsuite/elements/tee.c b/tests/old/testsuite/elements/tee.c index eb08dc80ce..aaba12c906 100644 --- a/tests/old/testsuite/elements/tee.c +++ b/tests/old/testsuite/elements/tee.c @@ -70,16 +70,16 @@ main (int argc, char *argv[]) gst_bin_add (GST_BIN (pipeline), src); gst_bin_add (GST_BIN (pipeline), tee); - /* connect input part */ - g_print ("Connecting input elements\n"); - gst_pad_connect (gst_element_get_pad (src, "src"), - gst_element_get_pad (tee, "sink")); + /* link input part */ + g_print ("Linking input elements\n"); + gst_pad_link (gst_element_get_pad (src, "src"), + gst_element_get_pad (tee, "sink")); /* request one pad from tee */ g_print ("Requesting first pad\n"); tee_src1 = gst_element_get_request_pad (tee, "src%d"); gst_bin_add (GST_BIN (pipeline), sink1); - gst_pad_connect (tee_src1, gst_element_get_pad (sink1, "sink")); + gst_pad_link (tee_src1, gst_element_get_pad (sink1, "sink")); /* set to play */ g_print ("Doing 1 iteration\n"); @@ -91,9 +91,9 @@ main (int argc, char *argv[]) gst_element_set_state (pipeline, GST_STATE_PAUSED); tee_src2 = gst_element_get_request_pad (tee, "src%d"); gst_bin_add (GST_BIN (pipeline), sink2); - gst_pad_connect (tee_src2, gst_element_get_pad (sink2, "sink")); + gst_pad_link (tee_src2, gst_element_get_pad (sink2, "sink")); - /* now we have two fakesinks connected, iterate */ + /* now we have two fakesinks linked, iterate */ g_print ("Doing 1 iteration\n"); gst_element_set_state (pipeline, GST_STATE_PLAYING); gst_bin_iterate (GST_BIN (pipeline)); @@ -146,11 +146,11 @@ main (int argc, char *argv[]) /* remove the first one, iterate */ g_print ("Removing first sink\n"); gst_element_set_state (pipeline, GST_STATE_PAUSED); - gst_pad_disconnect (tee_src1, gst_element_get_pad (sink1, "sink")); + gst_pad_unlink (tee_src1, gst_element_get_pad (sink1, "sink")); gst_pad_destroy (tee_src1); gst_bin_remove (GST_BIN (pipeline), sink1); - /* only second fakesink connected, iterate */ + /* only second fakesink linked, iterate */ g_print ("Doing 1 iteration\n"); gst_element_set_state (pipeline, GST_STATE_PLAYING); gst_bin_iterate (GST_BIN (pipeline)); diff --git a/tests/old/testsuite/refcounting/bin.c b/tests/old/testsuite/refcounting/bin.c index 650da23536..9ef06633ed 100644 --- a/tests/old/testsuite/refcounting/bin.c +++ b/tests/old/testsuite/refcounting/bin.c @@ -32,7 +32,7 @@ create_bin_ghostpads (void) gst_bin_add (GST_BIN (bin), element1); element2 = gst_element_factory_make ("fakesink", NULL); gst_bin_add (GST_BIN (bin), element2); - gst_element_connect_pads (element1, "src", element2, "sink"); + gst_element_link_pads (element1, "src", element2, "sink"); gst_element_add_ghost_pad (bin, gst_element_get_pad (element1, "sink"), "ghost_sink"); return bin; diff --git a/tests/old/testsuite/refcounting/element_pad.c b/tests/old/testsuite/refcounting/element_pad.c index 403c48bab4..2c4894f618 100644 --- a/tests/old/testsuite/refcounting/element_pad.c +++ b/tests/old/testsuite/refcounting/element_pad.c @@ -42,28 +42,28 @@ main (int argc, gchar *argv[]) for (i=0; i<iters/2; i++) { element = gst_element_factory_make ("fakesink", NULL); element2 = gst_element_factory_make ("fakesrc", NULL); - gst_element_connect_pads (element, "sink", element2, "src"); - g_assert (GST_PAD_IS_CONNECTED (gst_element_get_pad (element2, "src"))); - g_assert (GST_PAD_IS_CONNECTED (gst_element_get_pad (element, "sink"))); + gst_element_link_pads (element, "sink", element2, "src"); + g_assert (GST_PAD_IS_LINKED (gst_element_get_pad (element2, "src"))); + g_assert (GST_PAD_IS_LINKED (gst_element_get_pad (element, "sink"))); gst_object_unref (GST_OBJECT (element)); - g_assert (!GST_PAD_IS_CONNECTED (gst_element_get_pad (element2, "src"))); + g_assert (!GST_PAD_IS_LINKED (gst_element_get_pad (element2, "src"))); gst_object_unref (GST_OBJECT (element2)); } - g_print ("create/connect/unref %d elements %ld\n", iters/2, vmsize()-usage1); + g_print ("create/link/unref %d elements %ld\n", iters/2, vmsize()-usage1); for (i=0; i<iters/2; i++) { element = gst_element_factory_make ("fakesink", NULL); element2 = gst_element_factory_make ("fakesrc", NULL); - gst_element_connect_pads (element, "sink", element2, "src"); - g_assert (GST_PAD_IS_CONNECTED (gst_element_get_pad (element2, "src"))); - g_assert (GST_PAD_IS_CONNECTED (gst_element_get_pad (element, "sink"))); + gst_element_link_pads (element, "sink", element2, "src"); + g_assert (GST_PAD_IS_LINKED (gst_element_get_pad (element2, "src"))); + g_assert (GST_PAD_IS_LINKED (gst_element_get_pad (element, "sink"))); gst_object_destroy (GST_OBJECT (element)); g_assert (GST_OBJECT_DESTROYED (element)); - g_assert (!GST_PAD_IS_CONNECTED (gst_element_get_pad (element2, "src"))); + g_assert (!GST_PAD_IS_LINKED (gst_element_get_pad (element2, "src"))); gst_object_unref (GST_OBJECT (element2)); gst_object_unref (GST_OBJECT (element)); } - g_print ("create/connect/destroy %d elements %ld\n", iters/2, vmsize()-usage1); + g_print ("create/link/destroy %d elements %ld\n", iters/2, vmsize()-usage1); element = gst_element_factory_make ("fakesink", NULL);; pad = gst_element_get_pad (element, "sink"); diff --git a/tests/old/testsuite/refcounting/thread.c b/tests/old/testsuite/refcounting/thread.c index f229a54c60..1844c70cb5 100644 --- a/tests/old/testsuite/refcounting/thread.c +++ b/tests/old/testsuite/refcounting/thread.c @@ -36,7 +36,7 @@ create_thread_ghostpads (void) gst_element_set_name (element2, "test2"); gst_element_add_pad (element2, gst_pad_new ("sink1", GST_PAD_SINK)); gst_bin_add (GST_BIN (thread), element2); - gst_element_connect (element1, "src1", element2, "sink1"); + gst_element_link (element1, "src1", element2, "sink1"); gst_element_add_ghost_pad (thread, gst_element_get_pad (element2, "sink1"), "sink1"); return thread; diff --git a/tests/old/testsuite/threads/thread.c b/tests/old/testsuite/threads/thread.c index b824c50f54..87dab97f78 100644 --- a/tests/old/testsuite/threads/thread.c +++ b/tests/old/testsuite/threads/thread.c @@ -29,7 +29,7 @@ construct_pipeline (GstElement *pipeline) queue = gst_element_factory_make ("queue", NULL); thread = gst_element_factory_make ("thread", NULL); - gst_element_connect_many (src, queue, identity, sink, NULL); + gst_element_link_many (src, queue, identity, sink, NULL); gst_bin_add_many (GST_BIN (pipeline), src, queue, thread, NULL); gst_bin_add_many (GST_BIN (thread), identity, sink, NULL); diff --git a/tests/old/testsuite/threads/threadb.c b/tests/old/testsuite/threads/threadb.c index 2329803d72..f68f146161 100644 --- a/tests/old/testsuite/threads/threadb.c +++ b/tests/old/testsuite/threads/threadb.c @@ -21,7 +21,7 @@ construct_pipeline (GstElement *pipeline) g_assert (identity); g_assert (sink); - gst_element_connect_many (src, identity, sink, NULL); + gst_element_link_many (src, identity, sink, NULL); gst_bin_add_many (GST_BIN (pipeline), src, identity, sink, NULL); diff --git a/testsuite/bytestream/gstbstest.c b/testsuite/bytestream/gstbstest.c index 99a943495d..48057031d4 100644 --- a/testsuite/bytestream/gstbstest.c +++ b/testsuite/bytestream/gstbstest.c @@ -160,17 +160,17 @@ gst_bstest_class_init (GstBsTestClass * klass) } -static GstPadConnectReturn +static GstPadLinkReturn gst_bstest_negotiate_src (GstPad * pad, GstCaps ** caps, gpointer * data) { GstBsTest *bstest = GST_BSTEST (gst_pad_get_parent (pad)); /* 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); + return gst_pad_proxy_link (pad, bstest->sinkpad, caps); } -static GstPadConnectReturn +static GstPadLinkReturn gst_bstest_negotiate_sink (GstPad * pad, GstCaps ** caps, gpointer * data) { GstBsTest *bstest = GST_BSTEST (gst_pad_get_parent (pad)); diff --git a/testsuite/bytestream/test1.c b/testsuite/bytestream/test1.c index 8fb8436dc3..b086f7246e 100644 --- a/testsuite/bytestream/test1.c +++ b/testsuite/bytestream/test1.c @@ -185,7 +185,7 @@ main (int argc, char *argv[]) bs = gst_element_factory_make ("bstest", "bs"); g_assert (bs); - gst_element_connect_many (src, bs, sink); + gst_element_link_many (src, bs, sink); gst_bin_add_many (GST_BIN (pipeline), src, bs, sink); diff --git a/testsuite/cleanup/cleanup1.c b/testsuite/cleanup/cleanup1.c index 3c8ff13d61..d1e0d29857 100644 --- a/testsuite/cleanup/cleanup1.c +++ b/testsuite/cleanup/cleanup1.c @@ -12,7 +12,7 @@ create_pipeline (void) fakesrc = gst_element_factory_make ("fakesrc", "fakesrc"); fakesink = gst_element_factory_make ("fakesink", "fakesink"); - gst_element_connect (fakesrc, fakesink); + gst_element_link (fakesrc, fakesink); gst_bin_add_many (GST_BIN (pipeline), fakesrc, fakesink, NULL); diff --git a/testsuite/cleanup/cleanup2.c b/testsuite/cleanup/cleanup2.c index 92e02178d1..5533b3716c 100644 --- a/testsuite/cleanup/cleanup2.c +++ b/testsuite/cleanup/cleanup2.c @@ -15,7 +15,7 @@ create_pipeline (void) gst_bin_add (GST_BIN (bin), fakesink); gst_element_add_ghost_pad (bin, gst_element_get_pad (fakesink, "sink"), "sink"); - gst_element_connect (fakesrc, bin); + gst_element_link (fakesrc, bin); gst_bin_add_many (GST_BIN (pipeline), fakesrc, bin, NULL); diff --git a/testsuite/cleanup/cleanup3.c b/testsuite/cleanup/cleanup3.c index 0bf01295c4..cdd102a005 100644 --- a/testsuite/cleanup/cleanup3.c +++ b/testsuite/cleanup/cleanup3.c @@ -15,10 +15,10 @@ create_pipeline (void) queue = gst_element_factory_make ("queue", "queue"); gst_bin_add (GST_BIN (thread), fakesink); gst_bin_add (GST_BIN (thread), queue); - gst_element_connect (queue, fakesink); + gst_element_link (queue, fakesink); gst_element_add_ghost_pad (thread, gst_element_get_pad (queue, "sink"), "sink"); - gst_element_connect (fakesrc, thread); + gst_element_link (fakesrc, thread); gst_bin_add (GST_BIN (pipeline), fakesrc); gst_bin_add (GST_BIN (pipeline), thread); diff --git a/testsuite/cleanup/cleanup4.c b/testsuite/cleanup/cleanup4.c index 4d0eb35eeb..d82058b3c7 100644 --- a/testsuite/cleanup/cleanup4.c +++ b/testsuite/cleanup/cleanup4.c @@ -30,7 +30,7 @@ main (gint argc, gchar *argv[]) fakesink = gst_element_factory_make ("fakesink", "fakesink"); - gst_element_connect (fakesrc, fakesink); + gst_element_link (fakesrc, fakesink); gst_bin_add (GST_BIN (bin), fakesink); gst_bin_add (GST_BIN (pipeline), bin); diff --git a/testsuite/clock/clock1.c b/testsuite/clock/clock1.c index 7728f53a19..ebce7c85cd 100644 --- a/testsuite/clock/clock1.c +++ b/testsuite/clock/clock1.c @@ -47,7 +47,7 @@ main (int argc, char *argv[]) return 1; } - gst_element_connect_many (src, id, sink, NULL); + gst_element_link_many (src, id, sink, NULL); gst_bin_add_many (GST_BIN (pipeline), src, id, sink, NULL); clock = gst_bin_get_clock (GST_BIN (pipeline)); diff --git a/testsuite/dynparams/dparamstest.c b/testsuite/dynparams/dparamstest.c index de921a27e6..0e576f19ff 100644 --- a/testsuite/dynparams/dparamstest.c +++ b/testsuite/dynparams/dparamstest.c @@ -223,8 +223,8 @@ int main(int argc,char *argv[]) { testelement = gst_element_factory_make ("dptest", "testelement"); g_assert (testelement); - gst_element_connect (src, testelement); - gst_element_connect (testelement, sink); + gst_element_link (src, testelement); + gst_element_link (testelement, sink); gst_bin_add (GST_BIN (pipeline), src); gst_bin_add (GST_BIN (pipeline), testelement); diff --git a/testsuite/elements/fake.c b/testsuite/elements/fake.c index 9fcba05beb..dcf3504b7a 100644 --- a/testsuite/elements/fake.c +++ b/testsuite/elements/fake.c @@ -54,14 +54,14 @@ main (int argc, char *argv[]) gst_bin_add (GST_BIN (pipeline), src); gst_bin_add (GST_BIN (pipeline), sink); - /* connect */ - g_print ("Connecting elements\n"); + /* link */ + g_print ("Linking elements\n"); gst_element_set_state (pipeline, GST_STATE_PLAYING); /* we expect this to give an error */ if (gst_bin_iterate (GST_BIN (pipeline)) != FALSE) { - g_warning ("Iterating a bin with unconnected elements should return FALSE !\n"); + g_warning ("Iterating a bin with unlinked elements should return FALSE !\n"); retval = 1; } @@ -75,7 +75,7 @@ main (int argc, char *argv[]) /* we expect this to work */ if (gst_bin_iterate (GST_BIN (pipeline)) != TRUE) { - g_error ("Iterating a bin with connected elements should return TRUE !\n"); + g_error ("Iterating a bin with linked elements should return TRUE !\n"); retval = 1; } diff --git a/testsuite/elements/tee.c b/testsuite/elements/tee.c index eb08dc80ce..aaba12c906 100644 --- a/testsuite/elements/tee.c +++ b/testsuite/elements/tee.c @@ -70,16 +70,16 @@ main (int argc, char *argv[]) gst_bin_add (GST_BIN (pipeline), src); gst_bin_add (GST_BIN (pipeline), tee); - /* connect input part */ - g_print ("Connecting input elements\n"); - gst_pad_connect (gst_element_get_pad (src, "src"), - gst_element_get_pad (tee, "sink")); + /* link input part */ + g_print ("Linking input elements\n"); + gst_pad_link (gst_element_get_pad (src, "src"), + gst_element_get_pad (tee, "sink")); /* request one pad from tee */ g_print ("Requesting first pad\n"); tee_src1 = gst_element_get_request_pad (tee, "src%d"); gst_bin_add (GST_BIN (pipeline), sink1); - gst_pad_connect (tee_src1, gst_element_get_pad (sink1, "sink")); + gst_pad_link (tee_src1, gst_element_get_pad (sink1, "sink")); /* set to play */ g_print ("Doing 1 iteration\n"); @@ -91,9 +91,9 @@ main (int argc, char *argv[]) gst_element_set_state (pipeline, GST_STATE_PAUSED); tee_src2 = gst_element_get_request_pad (tee, "src%d"); gst_bin_add (GST_BIN (pipeline), sink2); - gst_pad_connect (tee_src2, gst_element_get_pad (sink2, "sink")); + gst_pad_link (tee_src2, gst_element_get_pad (sink2, "sink")); - /* now we have two fakesinks connected, iterate */ + /* now we have two fakesinks linked, iterate */ g_print ("Doing 1 iteration\n"); gst_element_set_state (pipeline, GST_STATE_PLAYING); gst_bin_iterate (GST_BIN (pipeline)); @@ -146,11 +146,11 @@ main (int argc, char *argv[]) /* remove the first one, iterate */ g_print ("Removing first sink\n"); gst_element_set_state (pipeline, GST_STATE_PAUSED); - gst_pad_disconnect (tee_src1, gst_element_get_pad (sink1, "sink")); + gst_pad_unlink (tee_src1, gst_element_get_pad (sink1, "sink")); gst_pad_destroy (tee_src1); gst_bin_remove (GST_BIN (pipeline), sink1); - /* only second fakesink connected, iterate */ + /* only second fakesink linked, iterate */ g_print ("Doing 1 iteration\n"); gst_element_set_state (pipeline, GST_STATE_PLAYING); gst_bin_iterate (GST_BIN (pipeline)); diff --git a/testsuite/refcounting/bin.c b/testsuite/refcounting/bin.c index 650da23536..9ef06633ed 100644 --- a/testsuite/refcounting/bin.c +++ b/testsuite/refcounting/bin.c @@ -32,7 +32,7 @@ create_bin_ghostpads (void) gst_bin_add (GST_BIN (bin), element1); element2 = gst_element_factory_make ("fakesink", NULL); gst_bin_add (GST_BIN (bin), element2); - gst_element_connect_pads (element1, "src", element2, "sink"); + gst_element_link_pads (element1, "src", element2, "sink"); gst_element_add_ghost_pad (bin, gst_element_get_pad (element1, "sink"), "ghost_sink"); return bin; diff --git a/testsuite/refcounting/element_pad.c b/testsuite/refcounting/element_pad.c index 403c48bab4..2c4894f618 100644 --- a/testsuite/refcounting/element_pad.c +++ b/testsuite/refcounting/element_pad.c @@ -42,28 +42,28 @@ main (int argc, gchar *argv[]) for (i=0; i<iters/2; i++) { element = gst_element_factory_make ("fakesink", NULL); element2 = gst_element_factory_make ("fakesrc", NULL); - gst_element_connect_pads (element, "sink", element2, "src"); - g_assert (GST_PAD_IS_CONNECTED (gst_element_get_pad (element2, "src"))); - g_assert (GST_PAD_IS_CONNECTED (gst_element_get_pad (element, "sink"))); + gst_element_link_pads (element, "sink", element2, "src"); + g_assert (GST_PAD_IS_LINKED (gst_element_get_pad (element2, "src"))); + g_assert (GST_PAD_IS_LINKED (gst_element_get_pad (element, "sink"))); gst_object_unref (GST_OBJECT (element)); - g_assert (!GST_PAD_IS_CONNECTED (gst_element_get_pad (element2, "src"))); + g_assert (!GST_PAD_IS_LINKED (gst_element_get_pad (element2, "src"))); gst_object_unref (GST_OBJECT (element2)); } - g_print ("create/connect/unref %d elements %ld\n", iters/2, vmsize()-usage1); + g_print ("create/link/unref %d elements %ld\n", iters/2, vmsize()-usage1); for (i=0; i<iters/2; i++) { element = gst_element_factory_make ("fakesink", NULL); element2 = gst_element_factory_make ("fakesrc", NULL); - gst_element_connect_pads (element, "sink", element2, "src"); - g_assert (GST_PAD_IS_CONNECTED (gst_element_get_pad (element2, "src"))); - g_assert (GST_PAD_IS_CONNECTED (gst_element_get_pad (element, "sink"))); + gst_element_link_pads (element, "sink", element2, "src"); + g_assert (GST_PAD_IS_LINKED (gst_element_get_pad (element2, "src"))); + g_assert (GST_PAD_IS_LINKED (gst_element_get_pad (element, "sink"))); gst_object_destroy (GST_OBJECT (element)); g_assert (GST_OBJECT_DESTROYED (element)); - g_assert (!GST_PAD_IS_CONNECTED (gst_element_get_pad (element2, "src"))); + g_assert (!GST_PAD_IS_LINKED (gst_element_get_pad (element2, "src"))); gst_object_unref (GST_OBJECT (element2)); gst_object_unref (GST_OBJECT (element)); } - g_print ("create/connect/destroy %d elements %ld\n", iters/2, vmsize()-usage1); + g_print ("create/link/destroy %d elements %ld\n", iters/2, vmsize()-usage1); element = gst_element_factory_make ("fakesink", NULL);; pad = gst_element_get_pad (element, "sink"); diff --git a/testsuite/refcounting/thread.c b/testsuite/refcounting/thread.c index f229a54c60..1844c70cb5 100644 --- a/testsuite/refcounting/thread.c +++ b/testsuite/refcounting/thread.c @@ -36,7 +36,7 @@ create_thread_ghostpads (void) gst_element_set_name (element2, "test2"); gst_element_add_pad (element2, gst_pad_new ("sink1", GST_PAD_SINK)); gst_bin_add (GST_BIN (thread), element2); - gst_element_connect (element1, "src1", element2, "sink1"); + gst_element_link (element1, "src1", element2, "sink1"); gst_element_add_ghost_pad (thread, gst_element_get_pad (element2, "sink1"), "sink1"); return thread; diff --git a/testsuite/threads/thread.c b/testsuite/threads/thread.c index b824c50f54..87dab97f78 100644 --- a/testsuite/threads/thread.c +++ b/testsuite/threads/thread.c @@ -29,7 +29,7 @@ construct_pipeline (GstElement *pipeline) queue = gst_element_factory_make ("queue", NULL); thread = gst_element_factory_make ("thread", NULL); - gst_element_connect_many (src, queue, identity, sink, NULL); + gst_element_link_many (src, queue, identity, sink, NULL); gst_bin_add_many (GST_BIN (pipeline), src, queue, thread, NULL); gst_bin_add_many (GST_BIN (thread), identity, sink, NULL); diff --git a/testsuite/threads/threadb.c b/testsuite/threads/threadb.c index 2329803d72..f68f146161 100644 --- a/testsuite/threads/threadb.c +++ b/testsuite/threads/threadb.c @@ -21,7 +21,7 @@ construct_pipeline (GstElement *pipeline) g_assert (identity); g_assert (sink); - gst_element_connect_many (src, identity, sink, NULL); + gst_element_link_many (src, identity, sink, NULL); gst_bin_add_many (GST_BIN (pipeline), src, identity, sink, NULL); |