From efa8cddb9574e49d170de57352cb9d59a8408f27 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Tue, 16 Aug 2005 12:15:46 +0000 Subject: [PATCH] docs/manual/: Fix docs to use _bin_add() before _link(), which fixes the examples with recent core versions (reported... Original commit message from CVS: * docs/manual/advanced-dataaccess.xml: * docs/manual/basics-helloworld.xml: Fix docs to use _bin_add() before _link(), which fixes the examples with recent core versions (reported by Madhan Raj M , #313199). --- ChangeLog | 8 ++++++++ docs/manual/advanced-dataaccess.xml | 4 ++-- docs/manual/basics-helloworld.xml | 8 ++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7516eb8..f10436e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-08-16 Ronald S. Bultje + + * docs/manual/advanced-dataaccess.xml: + * docs/manual/basics-helloworld.xml: + Fix docs to use _bin_add() before _link(), which fixes the examples + with recent core versions (reported by Madhan Raj M + , #313199). + 2005-08-16 Wim Taymans * check/gst/gstvalue.c: (GST_START_TEST), (gst_value_suite): diff --git a/docs/manual/advanced-dataaccess.xml b/docs/manual/advanced-dataaccess.xml index ce5252d..88abe57 100644 --- a/docs/manual/advanced-dataaccess.xml +++ b/docs/manual/advanced-dataaccess.xml @@ -78,8 +78,8 @@ main (gint argc, filter = gst_element_factory_make ("capsfilter", "filter"); csp = gst_element_factory_make ("ffmpegcolorspace", "csp"); sink = gst_element_factory_make ("xvimagesink", "sink"); - gst_element_link_many (src, filter, csp, sink, NULL); gst_bin_add_many (GST_BIN (pipeline), src, filter, csp, sink, NULL); + gst_element_link_many (src, filter, csp, sink, NULL); g_object_set (G_OBJECT (filter), "filter-caps", gst_caps_new_simple ("video/x-raw-rgb", "width", G_TYPE_INT, 384, @@ -244,8 +244,8 @@ main (gint argc, "depth", G_TYPE_INT, 16, "endianness", G_TYPE_INT, G_BYTE_ORDER, NULL), NULL); - gst_element_link_many (fakesrc, flt, conv, videosink, NULL); gst_bin_add_many (GST_BIN (pipeline), fakesrc, flt, conv, videosink, NULL); + gst_element_link_many (fakesrc, flt, conv, videosink, NULL); /* setup fake source */ g_object_set (G_OBJECT (fakesrc), diff --git a/docs/manual/basics-helloworld.xml b/docs/manual/basics-helloworld.xml index eb994c0..e6cadf1 100644 --- a/docs/manual/basics-helloworld.xml +++ b/docs/manual/basics-helloworld.xml @@ -143,6 +143,10 @@ main (int argc, gst_bus_add_watch (gst_pipeline_get_bus (GST_PIPELINE (pipeline)), bus_call, loop); + /* put all elements in a bin */ + gst_bin_add_many (GST_BIN (pipeline), + source, parser, decoder, conv, sink, NULL); + /* link together - note that we cannot link the parser and * decoder yet, becuse the parser uses dynamic pads. For that, * we set a pad-added signal handler. */ @@ -150,10 +154,6 @@ main (int argc, gst_element_link_many (decoder, conv, sink, NULL); g_signal_connect (parser, "pad-added", G_CALLBACK (new_pad), NULL); - /* put all elements in a bin */ - gst_bin_add_many (GST_BIN (pipeline), - source, parser, decoder, conv, sink, NULL); - /* Now set to playing and iterate. */ g_print ("Setting to PLAYING\n"); gst_element_set_state (pipeline, GST_STATE_PLAYING); -- 2.7.4