diff --git a/ChangeLog b/ChangeLog index 2cd27f543f..8f448195ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-01-11 Tim-Philipp Müller + + * docs/manual/basics-bins.xml: + * docs/manual/basics-elements.xml: + * docs/manual/intro-basics.xml: + Some more minor docs additions and updates. + 2006-01-11 Wim Taymans * docs/manual/basics-bins.xml: diff --git a/docs/manual/basics-bins.xml b/docs/manual/basics-bins.xml index 5a8e13d67a..943de0241d 100644 --- a/docs/manual/basics-bins.xml +++ b/docs/manual/basics-bins.xml @@ -134,7 +134,7 @@ main (int argc player = gst_element_factory_make ("oggvorbisplayer", "player"); /* set the source audio file */ - g_object_set (G_OBJECT (player), "location", "helloworld.ogg", NULL); + g_object_set (player, "location", "helloworld.ogg", NULL); /* start playback */ gst_element_set_state (GST_ELEMENT (player), GST_STATE_PLAYING); @@ -148,5 +148,11 @@ main (int argc url="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/pwg/html/index.html">Plugin Writers Guide. + + Examples of such custom bins are the playbin and decodebin elements from + gst-plugins-base. + diff --git a/docs/manual/basics-elements.xml b/docs/manual/basics-elements.xml index 9d81a05c38..efa666cff2 100644 --- a/docs/manual/basics-elements.xml +++ b/docs/manual/basics-elements.xml @@ -530,7 +530,9 @@ main (int argc, any form. Internally, &GStreamer; will start threads that take this task on to them. &GStreamer; will also take care of switching messages from the pipeline's thread into the application's own - thread, by using . + thread, by using a GstBus. See + for details. diff --git a/docs/manual/intro-basics.xml b/docs/manual/intro-basics.xml index 616ece881f..565b03a710 100644 --- a/docs/manual/intro-basics.xml +++ b/docs/manual/intro-basics.xml @@ -35,16 +35,14 @@ themselves, you can mostly control a bin as if it where an element, thereby abstracting away a lot of complexity for your application. You can, for example change state on all elements in a bin by changing the - state of that bin itself. Bins also forward some signals from their - contained childs (such as errors and tags). + state of that bin itself. Bins also forward bus messages from their + contained children (such as error messages, tag messages or EOS messages). - A pipeline is a bin that allows to run (technically - referred to as iterating) its contained childs. By - iterating a pipeline, data flow will start and media processing will - take place. A pipeline requires iterating for anything to happen. you - can also use threads, which automatically iterate the contained childs - in a newly created threads. We will go into this in detail later on. + A pipeline is a top-level bin. As you set it to PAUSED or PLAYING state, + data flow will start and media processing will take place. Once started, + pipelines will run in a separate thread until you stop them or the end + of the data stream is reached. @@ -79,8 +77,12 @@ between elements. Data flows out of one element through one or more source pads, and elements accept incoming data through one or more sink pads. Source and sink - elements have only source and sink pads, respectively. Data is - embodied in a GstData structure. + elements have only source and sink pads, respectively. Data usually + means buffers (described by the GstBuffer + object) and events (described by the + GstEvent object).