fixing examples fixing docs typos changing log priority in error situations

Original commit message from CVS:
* examples/controller/audio-example.c: (main):
* examples/queue/queue.c: (event_loop):
* gst/base/gstbasetransform.h:
* gst/gstelement.c: (gst_element_send_event):
* gst/gstevent.h:
* gst/gstpad.c: (gst_pad_send_event):
fixing examples
fixing docs typos
changing log priority in error situations
This commit is contained in:
Stefan Kost 2005-10-26 18:57:43 +00:00
parent b844f4ab4d
commit 349aa7e2e6
10 changed files with 27 additions and 19 deletions

View file

@ -1,3 +1,15 @@
2005-10-26 Stefan Kost <ensonic@users.sf.net>
* examples/controller/audio-example.c: (main):
* examples/queue/queue.c: (event_loop):
* gst/base/gstbasetransform.h:
* gst/gstelement.c: (gst_element_send_event):
* gst/gstevent.h:
* gst/gstpad.c: (gst_pad_send_event):
fixing examples
fixing docs typos
changing log priority in error situations
2005-10-25 Wim Taymans <wim@fluendo.com> 2005-10-25 Wim Taymans <wim@fluendo.com>
* gst/gstbin.c: (message_check), (bin_replace_message), * gst/gstbin.c: (message_check), (bin_replace_message),

View file

@ -7,7 +7,7 @@
*/ */
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/controller/gst-controller.h> #include <gst/controller/gstcontroller.h>
gint gint
main (gint argc, gchar ** argv) main (gint argc, gchar ** argv)
@ -27,8 +27,7 @@ main (gint argc, gchar ** argv)
// build pipeline // build pipeline
bin = gst_pipeline_new ("pipeline"); bin = gst_pipeline_new ("pipeline");
clock = gst_pipeline_get_clock (GST_PIPELINE (bin)); clock = gst_pipeline_get_clock (GST_PIPELINE (bin));
/* TODO make this "testaudiosrc", when its ready */ src = gst_element_factory_make ("audiotestsrc", "gen_audio");
src = gst_element_factory_make ("sinesrc", "gen_audio");
sink = gst_element_factory_make ("alsasink", "play_audio"); sink = gst_element_factory_make ("alsasink", "play_audio");
gst_bin_add_many (GST_BIN (bin), src, sink, NULL); gst_bin_add_many (GST_BIN (bin), src, sink, NULL);
if (!gst_element_link (src, sink)) { if (!gst_element_link (src, sink)) {

View file

@ -13,18 +13,15 @@ static void
event_loop (GstElement * pipe) event_loop (GstElement * pipe)
{ {
GstBus *bus; GstBus *bus;
GstMessageType revent;
GstMessage *message = NULL; GstMessage *message = NULL;
bus = gst_element_get_bus (GST_ELEMENT (pipe)); bus = gst_element_get_bus (GST_ELEMENT (pipe));
while (TRUE) { while (TRUE) {
revent = gst_bus_poll (bus, GST_MESSAGE_ANY, -1); message = gst_bus_poll (bus, GST_MESSAGE_ANY, -1);
message = gst_bus_pop (bus);
g_assert (message != NULL); g_assert (message != NULL);
switch (revent) { switch (message->type) {
case GST_MESSAGE_EOS: case GST_MESSAGE_EOS:
gst_message_unref (message); gst_message_unref (message);
return; return;

View file

@ -56,6 +56,7 @@ struct _GstBaseTransform {
GstPad *sinkpad; GstPad *sinkpad;
GstPad *srcpad; GstPad *srcpad;
/*< public >*/
/* Set by sub-class */ /* Set by sub-class */
gboolean passthrough; gboolean passthrough;
gboolean always_in_place; gboolean always_in_place;
@ -71,6 +72,7 @@ struct _GstBaseTransform {
gboolean have_newsegment; gboolean have_newsegment;
/* MT-protected (with STREAM_LOCK) */
gdouble segment_rate; gdouble segment_rate;
gint64 segment_start; gint64 segment_start;
gint64 segment_stop; gint64 segment_stop;

View file

@ -1198,7 +1198,7 @@ gst_element_send_event (GstElement * element, GstEvent * event)
result = gst_pad_push_event (pad, event); result = gst_pad_push_event (pad, event);
gst_object_unref (pad); gst_object_unref (pad);
} else { } else {
GST_CAT_DEBUG (GST_CAT_ELEMENT_PADS, "can't send event on element %s", GST_CAT_INFO (GST_CAT_ELEMENT_PADS, "can't send event on element %s",
GST_ELEMENT_NAME (element)); GST_ELEMENT_NAME (element));
} }
} }

View file

@ -244,7 +244,7 @@ typedef enum {
* complete scan of the file in those cases. * complete scan of the file in those cases.
* *
* When perfoming a segment seek: after the playback of the segment completes, * When perfoming a segment seek: after the playback of the segment completes,
* no EOS will be emmited byt the element that performed the seek but a SEGMENT_DONE * no EOS will be emmited by the element that performed the seek, but a SEGMENT_DONE
* message will be posted on the bus by the element. When this message is posted, it is * message will be posted on the bus by the element. When this message is posted, it is
* possible to send a new seek event to continue playback. With this seek method it * possible to send a new seek event to continue playback. With this seek method it
* is possible to perform seemless looping or simple linear editing. * is possible to perform seemless looping or simple linear editing.

View file

@ -3585,7 +3585,7 @@ no_function:
flushing: flushing:
{ {
GST_UNLOCK (pad); GST_UNLOCK (pad);
GST_CAT_DEBUG (GST_CAT_EVENT, "Received event on flushing pad. Discarding"); GST_CAT_INFO (GST_CAT_EVENT, "Received event on flushing pad. Discarding");
gst_event_unref (event); gst_event_unref (event);
return FALSE; return FALSE;
} }

View file

@ -56,6 +56,7 @@ struct _GstBaseTransform {
GstPad *sinkpad; GstPad *sinkpad;
GstPad *srcpad; GstPad *srcpad;
/*< public >*/
/* Set by sub-class */ /* Set by sub-class */
gboolean passthrough; gboolean passthrough;
gboolean always_in_place; gboolean always_in_place;
@ -71,6 +72,7 @@ struct _GstBaseTransform {
gboolean have_newsegment; gboolean have_newsegment;
/* MT-protected (with STREAM_LOCK) */
gdouble segment_rate; gdouble segment_rate;
gint64 segment_start; gint64 segment_start;
gint64 segment_stop; gint64 segment_stop;

View file

@ -7,7 +7,7 @@
*/ */
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/controller/gst-controller.h> #include <gst/controller/gstcontroller.h>
gint gint
main (gint argc, gchar ** argv) main (gint argc, gchar ** argv)
@ -27,8 +27,7 @@ main (gint argc, gchar ** argv)
// build pipeline // build pipeline
bin = gst_pipeline_new ("pipeline"); bin = gst_pipeline_new ("pipeline");
clock = gst_pipeline_get_clock (GST_PIPELINE (bin)); clock = gst_pipeline_get_clock (GST_PIPELINE (bin));
/* TODO make this "testaudiosrc", when its ready */ src = gst_element_factory_make ("audiotestsrc", "gen_audio");
src = gst_element_factory_make ("sinesrc", "gen_audio");
sink = gst_element_factory_make ("alsasink", "play_audio"); sink = gst_element_factory_make ("alsasink", "play_audio");
gst_bin_add_many (GST_BIN (bin), src, sink, NULL); gst_bin_add_many (GST_BIN (bin), src, sink, NULL);
if (!gst_element_link (src, sink)) { if (!gst_element_link (src, sink)) {

View file

@ -13,18 +13,15 @@ static void
event_loop (GstElement * pipe) event_loop (GstElement * pipe)
{ {
GstBus *bus; GstBus *bus;
GstMessageType revent;
GstMessage *message = NULL; GstMessage *message = NULL;
bus = gst_element_get_bus (GST_ELEMENT (pipe)); bus = gst_element_get_bus (GST_ELEMENT (pipe));
while (TRUE) { while (TRUE) {
revent = gst_bus_poll (bus, GST_MESSAGE_ANY, -1); message = gst_bus_poll (bus, GST_MESSAGE_ANY, -1);
message = gst_bus_pop (bus);
g_assert (message != NULL); g_assert (message != NULL);
switch (revent) { switch (message->type) {
case GST_MESSAGE_EOS: case GST_MESSAGE_EOS:
gst_message_unref (message); gst_message_unref (message);
return; return;