mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-31 20:48:56 +00:00
tried fixing, failed spectacularly
Original commit message from CVS: tried fixing, failed spectacularly
This commit is contained in:
parent
92a284110b
commit
223a929f5d
4 changed files with 18 additions and 28 deletions
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue