mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 12:11:13 +00:00
change _connect to _link
Original commit message from CVS: change _connect to _link
This commit is contained in:
parent
c4d31322bc
commit
05b156788c
4 changed files with 19 additions and 19 deletions
2
common
2
common
|
@ -1 +1 @@
|
|||
Subproject commit 2c2bce01ed5ed1d1684bd76a334477398009ef4a
|
||||
Subproject commit b5288e8215c6eacf0782880f6c5b6dea8f445a34
|
|
@ -13,7 +13,7 @@ new_pad_func (GstElement *element, GstPad *newpad, gpointer data)
|
|||
|
||||
if (!strcmp (gst_pad_get_name (newpad), "video_00")) {
|
||||
gst_element_set_state (pipeline, GST_STATE_PAUSED);
|
||||
gst_pad_connect (newpad, gst_element_get_pad (queue, "sink"));
|
||||
gst_pad_link (newpad, gst_element_get_pad (queue, "sink"));
|
||||
gst_element_set_state (pipeline, GST_STATE_PLAYING);
|
||||
}
|
||||
}
|
||||
|
@ -65,11 +65,11 @@ main (gint argc, gchar *argv[])
|
|||
gst_bin_add (GST_BIN (thread), xvideosink);
|
||||
gst_bin_add (GST_BIN (pipeline), thread);
|
||||
|
||||
gst_element_connect (filesrc, "src", demux, "sink");
|
||||
gst_element_connect (queue, "src", mpeg2dec, "sink");
|
||||
gst_element_connect (mpeg2dec, "src", colorspace, "sink");
|
||||
gst_element_link (filesrc, "src", demux, "sink");
|
||||
gst_element_link (queue, "src", mpeg2dec, "sink");
|
||||
gst_element_link (mpeg2dec, "src", colorspace, "sink");
|
||||
/* force RGB data passing between colorspace and xvideosink */
|
||||
res = gst_element_connect_filtered (colorspace, "src", xvideosink, "sink",
|
||||
res = gst_element_link_filtered (colorspace, "src", xvideosink, "sink",
|
||||
GST_CAPS_NEW (
|
||||
"filtercaps",
|
||||
"video/raw",
|
||||
|
|
|
@ -21,11 +21,11 @@ void mpeg2parse_newpad(GstElement *parser,GstPad *pad, GstElement *pipeline) {
|
|||
g_print("***** a new pad %s was created\n", gst_pad_get_name(pad));
|
||||
|
||||
if (strncmp(gst_pad_get_name(pad), "video_", 6) == 0) {
|
||||
gst_pad_connect(pad, gst_element_get_pad(v_queue,"sink"));
|
||||
gst_pad_link(pad, gst_element_get_pad(v_queue,"sink"));
|
||||
gst_bin_add(GST_BIN(pipeline),v_thread);
|
||||
gst_element_set_state(v_thread,GST_STATE_PLAYING);
|
||||
} else if (strcmp(gst_pad_get_name(pad), "private_stream_1.0") == 0) {
|
||||
gst_pad_connect(pad, gst_element_get_pad(a_queue,"sink"));
|
||||
gst_pad_link(pad, gst_element_get_pad(a_queue,"sink"));
|
||||
gst_bin_add(GST_BIN(pipeline),a_thread);
|
||||
gst_element_set_state(a_thread,GST_STATE_PLAYING);
|
||||
}
|
||||
|
@ -67,7 +67,7 @@ int main(int argc,char *argv[]) {
|
|||
gst_bin_add(GST_BIN(pipeline),GST_ELEMENT(src));
|
||||
gst_bin_add(GST_BIN(pipeline),GST_ELEMENT(parse));
|
||||
|
||||
gst_element_connect(src,"src",parse,"sink");
|
||||
gst_element_link(src,"src",parse,"sink");
|
||||
|
||||
|
||||
/* ***** pre-construct the video thread ***** */
|
||||
|
@ -91,9 +91,9 @@ int main(int argc,char *argv[]) {
|
|||
gst_bin_add(GST_BIN(v_thread),GST_ELEMENT(color));
|
||||
gst_bin_add(GST_BIN(v_thread),GST_ELEMENT(show));
|
||||
|
||||
gst_element_connect(v_queue,"src",v_decode,"sink");
|
||||
gst_element_connect(v_decode,"src",color,"sink");
|
||||
gst_element_connect(color,"src",show,"sink");
|
||||
gst_element_link(v_queue,"src",v_decode,"sink");
|
||||
gst_element_link(v_decode,"src",color,"sink");
|
||||
gst_element_link(color,"src",show,"sink");
|
||||
|
||||
|
||||
/* ***** pre-construct the audio thread ***** */
|
||||
|
@ -113,8 +113,8 @@ int main(int argc,char *argv[]) {
|
|||
gst_bin_add(GST_BIN(a_thread),GST_ELEMENT(a_decode));
|
||||
gst_bin_add(GST_BIN(a_thread),GST_ELEMENT(osssink));
|
||||
|
||||
gst_element_connect(a_queue,"src",a_decode,"sink");
|
||||
gst_element_connect(a_decode,"src",osssink,"sink");
|
||||
gst_element_link(a_queue,"src",a_decode,"sink");
|
||||
gst_element_link(a_decode,"src",osssink,"sink");
|
||||
|
||||
|
||||
/* ***** construct the GUI ***** */
|
||||
|
|
|
@ -44,7 +44,7 @@ main (int argc, char *argv[])
|
|||
g_print ("setting up input\n");
|
||||
gst_bin_add (GST_BIN (pipeline), src);
|
||||
gst_bin_add (GST_BIN (pipeline), tee);
|
||||
gst_pad_connect (gst_element_get_pad (src, "src"),
|
||||
gst_pad_link (gst_element_get_pad (src, "src"),
|
||||
gst_element_get_pad (tee, "sink"));
|
||||
|
||||
/* set up fakesrc */
|
||||
|
@ -79,8 +79,8 @@ main (int argc, char *argv[])
|
|||
|
||||
gst_bin_add (GST_BIN (pipeline), encoder1);
|
||||
gst_bin_add (GST_BIN (pipeline), sink1);
|
||||
gst_pad_connect (teepad1, gst_element_get_pad (encoder1, "sink"));
|
||||
gst_pad_connect (gst_element_get_pad (encoder1, "src"),
|
||||
gst_pad_link (teepad1, gst_element_get_pad (encoder1, "sink"));
|
||||
gst_pad_link (gst_element_get_pad (encoder1, "src"),
|
||||
gst_element_get_pad (sink1, "sink"));
|
||||
|
||||
gst_element_set_state (pipeline, GST_STATE_PLAYING);
|
||||
|
@ -95,8 +95,8 @@ main (int argc, char *argv[])
|
|||
|
||||
gst_bin_add (GST_BIN (pipeline), encoder2);
|
||||
gst_bin_add (GST_BIN (pipeline), sink2);
|
||||
gst_pad_connect (teepad2, gst_element_get_pad (encoder2, "sink"));
|
||||
gst_pad_connect (gst_element_get_pad (encoder2, "src"),
|
||||
gst_pad_link (teepad2, gst_element_get_pad (encoder2, "sink"));
|
||||
gst_pad_link (gst_element_get_pad (encoder2, "src"),
|
||||
gst_element_get_pad (sink2, "sink"));
|
||||
|
||||
gst_element_set_state (pipeline, GST_STATE_PLAYING);
|
||||
|
|
Loading…
Reference in a new issue