From d845f192ae66b6e0993186c964328202457147c8 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 5 Sep 2007 22:29:58 +0000 Subject: [PATCH] docs/manual/highlevel-xml.xml: Fix XML example code. Fixes #472714. Original commit message from CVS: * docs/manual/highlevel-xml.xml: Fix XML example code. Fixes #472714. --- ChangeLog | 5 +++ docs/manual/highlevel-xml.xml | 73 +++++++++++++---------------------- 2 files changed, 32 insertions(+), 46 deletions(-) diff --git a/ChangeLog b/ChangeLog index fba18a4c36..2fdb23e447 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-09-05 Wim Taymans + + * docs/manual/highlevel-xml.xml: + Fix XML example code. Fixes #472714. + 2007-09-05 Wim Taymans * libs/gst/base/gstbasesink.c: (gst_base_sink_preroll_queue_flush), diff --git a/docs/manual/highlevel-xml.xml b/docs/manual/highlevel-xml.xml index 7153ca7b6d..a43ff1666c 100644 --- a/docs/manual/highlevel-xml.xml +++ b/docs/manual/highlevel-xml.xml @@ -1,11 +1,8 @@ XML in <application>GStreamer</application> - GStreamer uses XML to store and load - its pipeline definitions. XML is also used internally to manage the - plugin registry. The plugin registry is a file that contains the definition - of all the plugins GStreamer knows about to have - quick access to the specifics of the plugins. + GStreamer can use XML to store and load + its pipeline definitions. @@ -19,7 +16,7 @@ We create a simple pipeline and write it to stdout with gst_xml_write_file (). The following code constructs an MP3 player - pipeline with two threads and then writes out the XML both to stdout + pipeline and then writes out the XML both to stdout and to a file. Use this program with one argument: the MP3 file on disk. @@ -33,9 +30,8 @@ gboolean playing; int main (int argc, char *argv[]) { - GstElement *filesrc, *osssink, *queue, *queue2, *decode; - GstElement *bin; - GstElement *thread, *thread2; + GstElement *filesrc, *osssink, *decode; + GstElement *pipeline; gst_init (&argc,&argv); @@ -44,24 +40,15 @@ main (int argc, char *argv[]) exit (-1); } - /* create a new thread to hold the elements */ - thread = gst_element_factory_make ("thread", "thread"); - g_assert (thread != NULL); - thread2 = gst_element_factory_make ("thread", "thread2"); - g_assert (thread2 != NULL); - - /* create a new bin to hold the elements */ - bin = gst_bin_new ("bin"); - g_assert (bin != NULL); + /* create a new pipeline to hold the elements */ + pipeline = gst_element_factory_make ("pipeline", "pipeline"); + g_assert (pipeline != NULL); /* create a disk reader */ filesrc = gst_element_factory_make ("filesrc", "disk_source"); g_assert (filesrc != NULL); g_object_set (G_OBJECT (filesrc), "location", argv[1], NULL); - queue = gst_element_factory_make ("queue", "queue"); - queue2 = gst_element_factory_make ("queue", "queue2"); - /* and an audio sink */ osssink = gst_element_factory_make ("osssink", "play_audio"); g_assert (osssink != NULL); @@ -69,22 +56,16 @@ main (int argc, char *argv[]) decode = gst_element_factory_make ("mad", "decode"); g_assert (decode != NULL); - /* add objects to the main bin */ - gst_bin_add_many (GST_BIN (bin), filesrc, queue, NULL); + /* add objects to the main pipeline */ + gst_bin_add_many (GST_BIN (pipeline), filesrc, decode, osssink, NULL); - gst_bin_add_many (GST_BIN (thread), decode, queue2, NULL); + gst_element_link_many (filesrc, decode, osssink, NULL); - gst_bin_add (GST_BIN (thread2), osssink); - - gst_element_link_many (filesrc, queue, decode, queue2, osssink, NULL); - - gst_bin_add_many (GST_BIN (bin), thread, thread2, NULL); - - /* write the bin to stdout */ - gst_xml_write_file (GST_ELEMENT (bin), stdout); + /* write the pipeline to stdout */ + gst_xml_write_file (GST_ELEMENT (pipeline), stdout); /* write the bin to a file */ - gst_xml_write_file (GST_ELEMENT (bin), fopen ("xmlTest.gst", "w")); + gst_xml_write_file (GST_ELEMENT (pipeline), fopen ("xmlTest.gst", "w")); exit (0); } @@ -94,7 +75,7 @@ main (int argc, char *argv[]) The most important line is: - gst_xml_write_file (GST_ELEMENT (bin), stdout); + gst_xml_write_file (GST_ELEMENT (pipeline), stdout); gst_xml_write_file () will turn the given element into an xmlDocPtr that @@ -125,7 +106,7 @@ int main(int argc, char *argv[]) { GstXML *xml; - GstElement *bin; + GstElement *pipeline; gboolean ret; gst_init (&argc, &argv); @@ -135,14 +116,14 @@ main(int argc, char *argv[]) ret = gst_xml_parse_file(xml, "xmlTest.gst", NULL); g_assert (ret == TRUE); - bin = gst_xml_get_element (xml, "bin"); - g_assert (bin != NULL); + pipeline = gst_xml_get_element (xml, "pipeline"); + g_assert (pipeline != NULL); - gst_element_set_state (bin, GST_STATE_PLAYING); + gst_element_set_state (pipeline, GST_STATE_PLAYING); - while (gst_bin_iterate(GST_BIN(bin))); + g_sleep (4); - gst_element_set_state (bin, GST_STATE_NULL); + gst_element_set_state (pipeline, GST_STATE_NULL); exit (0); } @@ -186,9 +167,9 @@ xmlNsPtr ns; ... ns = xmlNewNs (NULL, "http://gstreamer.net/gst-test/1.0/", "test"); ... - thread = gst_element_factory_make ("thread", "thread"); - g_signal_connect (G_OBJECT (thread), "object_saved", - G_CALLBACK (object_saved), g_strdup ("decoder thread")); + pipeline = gst_element_factory_make ("pipeline", "pipeline"); + g_signal_connect (G_OBJECT (pipeline), "object_saved", + G_CALLBACK (object_saved), g_strdup ("decoder pipeline")); ... @@ -212,13 +193,13 @@ object_saved (GstObject *object, xmlNodePtr parent, gpointer data) ... <gst:element> - <gst:name>thread</gst:name> - <gst:type>thread</gst:type> + <gst:name>pipeline</gst:name> + <gst:type>pipeline</gst:type> <gst:version>0.1.0</gst:version> ... </gst:children> <test:comment> - <test:text>decoder thread</test:text> + <test:text>decoder pipeline</test:text> </test:comment> </gst:element> ...