2005-03-21 17:34:02 +00:00
|
|
|
/* GStreamer
|
|
|
|
* Copyright (C) 2004 Wim Taymans <wim@fluendo.com>
|
|
|
|
*
|
|
|
|
* gstbus.c: GstBus subsystem
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Library General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Library General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Library General Public
|
|
|
|
* License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
2005-10-15 16:01:57 +00:00
|
|
|
|
2005-08-23 14:25:55 +00:00
|
|
|
/**
|
|
|
|
* SECTION:gstbus
|
|
|
|
* @short_description: Asynchronous message bus subsystem
|
2005-08-27 10:57:00 +00:00
|
|
|
* @see_also: #GstMessage, #GstElement
|
|
|
|
*
|
|
|
|
* The #GstBus is an object responsible for delivering #GstMessages in
|
|
|
|
* a first-in first-out way from the streaming threads to the application.
|
2005-10-15 15:30:24 +00:00
|
|
|
*
|
2005-08-27 10:57:00 +00:00
|
|
|
* Since the application typically only wants to deal with delivery of these
|
|
|
|
* messages from one thread, the GstBus will marshall the messages between
|
|
|
|
* different threads. This is important since the actual streaming of media
|
|
|
|
* is done in another thread than the application.
|
2005-10-15 15:30:24 +00:00
|
|
|
*
|
2005-08-27 10:57:00 +00:00
|
|
|
* The GstBus provides support for #GSource based notifications. This makes it
|
|
|
|
* possible to handle the delivery in the glib mainloop.
|
2005-10-08 08:00:37 +00:00
|
|
|
*
|
|
|
|
* The #GSource callback function gst_bus_async_signal_func() can be used to
|
|
|
|
* convert all bus messages into signal emissions.
|
2005-10-15 15:30:24 +00:00
|
|
|
*
|
2005-08-27 10:57:00 +00:00
|
|
|
* A message is posted on the bus with the gst_bus_post() method. With the
|
2006-01-20 19:01:59 +00:00
|
|
|
* gst_bus_peek() and gst_bus_pop() methods one can look at or retrieve a
|
|
|
|
* previously posted message.
|
2005-10-15 15:30:24 +00:00
|
|
|
*
|
2005-08-27 10:57:00 +00:00
|
|
|
* The bus can be polled with the gst_bus_poll() method. This methods blocks
|
|
|
|
* up to the specified timeout value until one of the specified messages types
|
|
|
|
* is posted on the bus. The application can then _pop() the messages from the
|
|
|
|
* bus to handle them.
|
2005-10-15 16:01:57 +00:00
|
|
|
* Alternatively the application can register an asynchronous bus function
|
|
|
|
* using gst_bus_add_watch_full() or gst_bus_add_watch(). This function will
|
|
|
|
* receive messages a short while after they have been posted.
|
2005-10-15 15:30:24 +00:00
|
|
|
*
|
|
|
|
* It is also possible to get messages from the bus without any thread
|
2005-08-27 10:57:00 +00:00
|
|
|
* marshalling with the gst_bus_set_sync_handler() method. This makes it
|
|
|
|
* possible to react to a message in the same thread that posted the
|
|
|
|
* message on the bus. This should only be used if the application is able
|
|
|
|
* to deal with messages from different threads.
|
2005-08-31 10:00:08 +00:00
|
|
|
*
|
2005-10-08 08:00:37 +00:00
|
|
|
* Every #GstPipeline has one bus.
|
2005-09-23 18:02:18 +00:00
|
|
|
*
|
2005-10-15 16:01:57 +00:00
|
|
|
* Note that a #GstPipeline will set its bus into flushing state when changing
|
|
|
|
* from READY to NULL state.
|
2005-10-28 18:18:23 +00:00
|
|
|
*
|
|
|
|
* Last reviewed on 2005-10-28 (0.9.4)
|
2005-08-23 14:25:55 +00:00
|
|
|
*/
|
2005-03-21 17:34:02 +00:00
|
|
|
|
|
|
|
#include <errno.h>
|
2005-10-12 22:34:47 +00:00
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
# include <unistd.h>
|
|
|
|
#endif
|
2005-03-21 17:34:02 +00:00
|
|
|
#include <sys/types.h>
|
|
|
|
|
|
|
|
#include "gst_private.h"
|
|
|
|
#include "gstinfo.h"
|
|
|
|
|
|
|
|
#include "gstbus.h"
|
|
|
|
|
2005-10-06 09:49:42 +00:00
|
|
|
#define GST_CAT_DEFAULT GST_CAT_BUS
|
2005-09-28 16:43:20 +00:00
|
|
|
/* bus signals */
|
|
|
|
enum
|
|
|
|
{
|
|
|
|
SYNC_MESSAGE,
|
|
|
|
ASYNC_MESSAGE,
|
|
|
|
/* add more above */
|
|
|
|
LAST_SIGNAL
|
|
|
|
};
|
2005-03-21 17:34:02 +00:00
|
|
|
|
|
|
|
static void gst_bus_class_init (GstBusClass * klass);
|
|
|
|
static void gst_bus_init (GstBus * bus);
|
|
|
|
static void gst_bus_dispose (GObject * object);
|
|
|
|
|
|
|
|
static void gst_bus_set_property (GObject * object, guint prop_id,
|
|
|
|
const GValue * value, GParamSpec * pspec);
|
|
|
|
static void gst_bus_get_property (GObject * object, guint prop_id,
|
|
|
|
GValue * value, GParamSpec * pspec);
|
|
|
|
|
|
|
|
static GstObjectClass *parent_class = NULL;
|
2005-09-28 16:43:20 +00:00
|
|
|
static guint gst_bus_signals[LAST_SIGNAL] = { 0 };
|
2005-03-21 17:34:02 +00:00
|
|
|
|
2005-11-04 11:43:10 +00:00
|
|
|
/* the context we wakeup when we posted a message on the bus */
|
|
|
|
static GMainContext *main_context;
|
|
|
|
|
2006-02-10 16:04:59 +00:00
|
|
|
struct _GstBusPrivate
|
|
|
|
{
|
|
|
|
guint num_sync_message_emitters;
|
|
|
|
};
|
|
|
|
|
2005-03-21 17:34:02 +00:00
|
|
|
GType
|
|
|
|
gst_bus_get_type (void)
|
|
|
|
{
|
|
|
|
static GType bus_type = 0;
|
|
|
|
|
|
|
|
if (!bus_type) {
|
|
|
|
static const GTypeInfo bus_info = {
|
|
|
|
sizeof (GstBusClass),
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
(GClassInitFunc) gst_bus_class_init,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
sizeof (GstBus),
|
|
|
|
0,
|
|
|
|
(GInstanceInitFunc) gst_bus_init,
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
bus_type = g_type_register_static (GST_TYPE_OBJECT, "GstBus", &bus_info, 0);
|
|
|
|
}
|
|
|
|
return bus_type;
|
|
|
|
}
|
|
|
|
|
2005-09-28 16:43:20 +00:00
|
|
|
/* fixme: do something about this */
|
|
|
|
static void
|
|
|
|
marshal_VOID__MINIOBJECT (GClosure * closure, GValue * return_value,
|
|
|
|
guint n_param_values, const GValue * param_values, gpointer invocation_hint,
|
|
|
|
gpointer marshal_data)
|
|
|
|
{
|
|
|
|
typedef void (*marshalfunc_VOID__MINIOBJECT) (gpointer obj, gpointer arg1,
|
|
|
|
gpointer data2);
|
|
|
|
register marshalfunc_VOID__MINIOBJECT callback;
|
|
|
|
register GCClosure *cc = (GCClosure *) closure;
|
|
|
|
register gpointer data1, data2;
|
|
|
|
|
|
|
|
g_return_if_fail (n_param_values == 2);
|
|
|
|
|
|
|
|
if (G_CCLOSURE_SWAP_DATA (closure)) {
|
|
|
|
data1 = closure->data;
|
|
|
|
data2 = g_value_peek_pointer (param_values + 0);
|
|
|
|
} else {
|
|
|
|
data1 = g_value_peek_pointer (param_values + 0);
|
|
|
|
data2 = closure->data;
|
|
|
|
}
|
|
|
|
callback =
|
|
|
|
(marshalfunc_VOID__MINIOBJECT) (marshal_data ? marshal_data : cc->
|
|
|
|
callback);
|
|
|
|
|
|
|
|
callback (data1, gst_value_get_mini_object (param_values + 1), data2);
|
|
|
|
}
|
|
|
|
|
2005-03-21 17:34:02 +00:00
|
|
|
static void
|
|
|
|
gst_bus_class_init (GstBusClass * klass)
|
|
|
|
{
|
|
|
|
GObjectClass *gobject_class;
|
|
|
|
GstObjectClass *gstobject_class;
|
|
|
|
|
|
|
|
gobject_class = (GObjectClass *) klass;
|
|
|
|
gstobject_class = (GstObjectClass *) klass;
|
|
|
|
|
2005-09-23 17:17:42 +00:00
|
|
|
parent_class = g_type_class_peek_parent (klass);
|
2005-03-21 17:34:02 +00:00
|
|
|
|
|
|
|
if (!g_thread_supported ())
|
|
|
|
g_thread_init (NULL);
|
|
|
|
|
|
|
|
gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_bus_dispose);
|
|
|
|
gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_bus_set_property);
|
|
|
|
gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_bus_get_property);
|
2005-09-28 16:43:20 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* GstBus::sync-message:
|
|
|
|
* @bus: the object which received the signal
|
|
|
|
* @message: the message that has been posted synchronously
|
|
|
|
*
|
2005-11-03 12:16:49 +00:00
|
|
|
* A message has been posted on the bus. This signal is emitted from the
|
2005-09-28 16:43:20 +00:00
|
|
|
* thread that posted the message so one has to be carefull with locking.
|
|
|
|
*/
|
|
|
|
gst_bus_signals[SYNC_MESSAGE] =
|
|
|
|
g_signal_new ("sync-message", G_TYPE_FROM_CLASS (klass),
|
|
|
|
G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
|
|
|
|
G_STRUCT_OFFSET (GstBusClass, sync_message), NULL, NULL,
|
|
|
|
marshal_VOID__MINIOBJECT, G_TYPE_NONE, 1, GST_TYPE_MESSAGE);
|
|
|
|
|
|
|
|
/**
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
* GstBus::message:
|
2005-09-28 16:43:20 +00:00
|
|
|
* @bus: the object which received the signal
|
|
|
|
* @message: the message that has been posted asynchronously
|
|
|
|
*
|
2005-11-03 12:16:49 +00:00
|
|
|
* A message has been posted on the bus. This signal is emitted from a
|
2005-09-28 16:43:20 +00:00
|
|
|
* GSource added to the mainloop.
|
|
|
|
*/
|
|
|
|
gst_bus_signals[ASYNC_MESSAGE] =
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
g_signal_new ("message", G_TYPE_FROM_CLASS (klass),
|
2005-09-28 16:43:20 +00:00
|
|
|
G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
G_STRUCT_OFFSET (GstBusClass, message), NULL, NULL,
|
2005-09-28 16:43:20 +00:00
|
|
|
marshal_VOID__MINIOBJECT, G_TYPE_NONE, 1, GST_TYPE_MESSAGE);
|
2005-11-04 11:43:10 +00:00
|
|
|
|
|
|
|
main_context = g_main_context_default ();
|
2006-02-10 16:04:59 +00:00
|
|
|
|
|
|
|
g_type_class_add_private (klass, sizeof (GstBusPrivate));
|
2005-03-21 17:34:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gst_bus_init (GstBus * bus)
|
|
|
|
{
|
|
|
|
bus->queue = g_queue_new ();
|
|
|
|
bus->queue_lock = g_mutex_new ();
|
|
|
|
|
2006-02-10 16:04:59 +00:00
|
|
|
bus->priv = G_TYPE_INSTANCE_GET_PRIVATE (bus, GST_TYPE_BUS, GstBusPrivate);
|
|
|
|
|
2005-07-09 15:18:53 +00:00
|
|
|
GST_DEBUG_OBJECT (bus, "created");
|
2005-03-21 17:34:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gst_bus_dispose (GObject * object)
|
|
|
|
{
|
|
|
|
GstBus *bus;
|
|
|
|
|
|
|
|
bus = GST_BUS (object);
|
|
|
|
|
|
|
|
if (bus->queue) {
|
2005-08-26 13:28:01 +00:00
|
|
|
GstMessage *message;
|
|
|
|
|
2005-03-21 17:34:02 +00:00
|
|
|
g_mutex_lock (bus->queue_lock);
|
2005-08-26 13:28:01 +00:00
|
|
|
do {
|
|
|
|
message = g_queue_pop_head (bus->queue);
|
|
|
|
if (message)
|
|
|
|
gst_message_unref (message);
|
|
|
|
} while (message != NULL);
|
2005-03-21 17:34:02 +00:00
|
|
|
g_queue_free (bus->queue);
|
|
|
|
bus->queue = NULL;
|
|
|
|
g_mutex_unlock (bus->queue_lock);
|
|
|
|
g_mutex_free (bus->queue_lock);
|
|
|
|
bus->queue_lock = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
G_OBJECT_CLASS (parent_class)->dispose (object);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gst_bus_set_property (GObject * object, guint prop_id,
|
|
|
|
const GValue * value, GParamSpec * pspec)
|
|
|
|
{
|
|
|
|
GstBus *bus;
|
|
|
|
|
|
|
|
bus = GST_BUS (object);
|
|
|
|
|
|
|
|
switch (prop_id) {
|
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gst_bus_get_property (GObject * object, guint prop_id,
|
|
|
|
GValue * value, GParamSpec * pspec)
|
|
|
|
{
|
|
|
|
GstBus *bus;
|
|
|
|
|
|
|
|
bus = GST_BUS (object);
|
|
|
|
|
|
|
|
switch (prop_id) {
|
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-08-23 14:25:55 +00:00
|
|
|
/**
|
|
|
|
* gst_bus_new:
|
|
|
|
*
|
2005-10-28 18:18:23 +00:00
|
|
|
* Creates a new #GstBus instance.
|
2005-08-23 14:25:55 +00:00
|
|
|
*
|
|
|
|
* Returns: a new #GstBus instance
|
|
|
|
*/
|
2005-03-21 17:34:02 +00:00
|
|
|
GstBus *
|
|
|
|
gst_bus_new (void)
|
|
|
|
{
|
|
|
|
GstBus *result;
|
|
|
|
|
|
|
|
result = g_object_new (gst_bus_get_type (), NULL);
|
2006-01-20 19:01:59 +00:00
|
|
|
GST_DEBUG_OBJECT (result, "created new bus");
|
2005-03-21 17:34:02 +00:00
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* gst_bus_post:
|
|
|
|
* @bus: a #GstBus to post on
|
|
|
|
* @message: The #GstMessage to post
|
|
|
|
*
|
docs/design/part-events.txt: Small update.
Original commit message from CVS:
* docs/design/part-events.txt:
Small update.
* gst/base/gstbasesink.c: (gst_base_sink_handle_object),
(gst_base_sink_do_sync), (gst_base_sink_activate_push),
(gst_base_sink_activate_pull):
Some more comments.
* gst/elements/gstfakesrc.c: (gst_fake_src_class_init),
(gst_fake_src_create):
Fix handoff marshall.
* gst/elements/gstidentity.c: (gst_identity_class_init),
(gst_identity_transform_ip):
We're a real inplace element.
* gst/gstbus.c: (gst_bus_post):
Added some comments.
* tests/lat.c: (fakesrc), (fakesink), (simple), (queue), (main):
* tests/muxing/case1.c: (main):
* tests/sched/dynamic-pipeline.c: (main):
* tests/sched/interrupt1.c: (main):
* tests/sched/interrupt2.c: (main):
* tests/sched/interrupt3.c: (main):
* tests/sched/runxml.c: (main):
* tests/sched/sched-stress.c: (main):
* tests/seeking/seeking1.c: (event_received), (main):
* tests/threadstate/threadstate2.c: (bus_handler), (timeout_func),
(main):
* tests/threadstate/threadstate3.c: (main):
* tests/threadstate/threadstate4.c: (main):
* tests/threadstate/threadstate5.c: (main):
Fix the tests.
2005-07-22 11:47:10 +00:00
|
|
|
* Post a message on the given bus. Ownership of the message
|
|
|
|
* is taken by the bus.
|
2005-03-21 17:34:02 +00:00
|
|
|
*
|
2005-10-28 18:18:23 +00:00
|
|
|
* Returns: TRUE if the message could be posted, FALSE if the bus is flushing.
|
2005-03-21 17:34:02 +00:00
|
|
|
*
|
|
|
|
* MT safe.
|
|
|
|
*/
|
|
|
|
gboolean
|
|
|
|
gst_bus_post (GstBus * bus, GstMessage * message)
|
|
|
|
{
|
|
|
|
GstBusSyncReply reply = GST_BUS_PASS;
|
|
|
|
GstBusSyncHandler handler;
|
2006-02-10 16:04:59 +00:00
|
|
|
gboolean emit_sync_message;
|
2005-03-21 17:34:02 +00:00
|
|
|
gpointer handler_data;
|
|
|
|
|
|
|
|
g_return_val_if_fail (GST_IS_BUS (bus), FALSE);
|
|
|
|
g_return_val_if_fail (GST_IS_MESSAGE (message), FALSE);
|
|
|
|
|
2005-09-28 16:43:20 +00:00
|
|
|
GST_DEBUG_OBJECT (bus, "[msg %p] posting on bus, type %s",
|
|
|
|
message, gst_message_type_get_name (GST_MESSAGE_TYPE (message)));
|
2005-03-21 17:34:02 +00:00
|
|
|
|
2005-11-21 16:34:26 +00:00
|
|
|
GST_OBJECT_LOCK (bus);
|
2005-08-25 13:52:13 +00:00
|
|
|
/* check if the bus is flushing */
|
renamed GST_FLAGS macros to GST_OBJECT_FLAGS moved bitshift from macro to enum definition
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
* docs/gst/gstreamer-sections.txt:
* gst/base/gstbasesink.c: (gst_base_sink_init):
* gst/base/gstbasesrc.c: (gst_base_src_init),
(gst_base_src_get_range), (gst_base_src_check_get_range),
(gst_base_src_start), (gst_base_src_stop):
* gst/base/gstbasesrc.h:
* gst/elements/gstfakesrc.c: (gst_fake_src_set_property):
* gst/gstbin.c: (gst_bin_add_func), (gst_bin_remove_func),
(bin_element_is_sink), (reset_degree), (gst_bin_element_set_state),
(bin_bus_handler):
* gst/gstbin.h:
* gst/gstbuffer.h:
* gst/gstbus.c: (gst_bus_post), (gst_bus_set_flushing):
* gst/gstbus.h:
* gst/gstelement.c: (gst_element_is_locked_state),
(gst_element_set_locked_state), (gst_element_commit_state),
(gst_element_set_state):
* gst/gstelement.h:
* gst/gstindex.c: (gst_index_init):
* gst/gstindex.h:
* gst/gstminiobject.h:
* gst/gstobject.c: (gst_object_init), (gst_object_sink),
(gst_object_set_parent):
* gst/gstobject.h:
* gst/gstpad.c: (gst_pad_set_blocked_async), (gst_pad_is_blocked),
(gst_pad_get_caps_unlocked), (gst_pad_set_caps):
* gst/gstpad.h:
* gst/gstpadtemplate.h:
* gst/gstpipeline.c: (gst_pipeline_provide_clock_func),
(gst_pipeline_use_clock), (gst_pipeline_auto_clock):
* gst/gstpipeline.h:
* gst/indexers/gstfileindex.c: (gst_file_index_load),
(gst_file_index_commit):
* testsuite/bytestream/filepadsink.c: (gst_fp_sink_init):
* testsuite/pad/link.c: (gst_test_src_init),
(gst_test_filter_init), (gst_test_sink_init):
* testsuite/states/locked.c: (main):
renamed GST_FLAGS macros to GST_OBJECT_FLAGS
moved bitshift from macro to enum definition
2005-10-12 14:28:39 +00:00
|
|
|
if (GST_OBJECT_FLAG_IS_SET (bus, GST_BUS_FLUSHING))
|
2005-08-25 13:52:13 +00:00
|
|
|
goto is_flushing;
|
2005-05-11 03:37:10 +00:00
|
|
|
|
2005-03-21 17:34:02 +00:00
|
|
|
handler = bus->sync_handler;
|
|
|
|
handler_data = bus->sync_handler_data;
|
2006-02-10 16:04:59 +00:00
|
|
|
emit_sync_message = bus->priv->num_sync_message_emitters > 0;
|
2005-11-21 16:34:26 +00:00
|
|
|
GST_OBJECT_UNLOCK (bus);
|
2005-03-21 17:34:02 +00:00
|
|
|
|
|
|
|
/* first call the sync handler if it is installed */
|
2005-08-25 13:52:13 +00:00
|
|
|
if (handler)
|
2005-03-21 17:34:02 +00:00
|
|
|
reply = handler (bus, message, handler_data);
|
|
|
|
|
2006-02-10 16:04:59 +00:00
|
|
|
/* emit sync-message if requested to do so via
|
|
|
|
gst_bus_enable_sync_message_emission. terrible but effective */
|
|
|
|
if (emit_sync_message && reply != GST_BUS_DROP
|
|
|
|
&& handler != gst_bus_sync_signal_handler)
|
|
|
|
gst_bus_sync_signal_handler (bus, message, NULL);
|
|
|
|
|
2005-03-21 17:34:02 +00:00
|
|
|
/* now see what we should do with the message */
|
|
|
|
switch (reply) {
|
|
|
|
case GST_BUS_DROP:
|
|
|
|
/* drop the message */
|
2005-07-09 15:18:53 +00:00
|
|
|
GST_DEBUG_OBJECT (bus, "[msg %p] dropped", message);
|
2005-03-21 17:34:02 +00:00
|
|
|
break;
|
|
|
|
case GST_BUS_PASS:
|
docs/design/part-events.txt: Small update.
Original commit message from CVS:
* docs/design/part-events.txt:
Small update.
* gst/base/gstbasesink.c: (gst_base_sink_handle_object),
(gst_base_sink_do_sync), (gst_base_sink_activate_push),
(gst_base_sink_activate_pull):
Some more comments.
* gst/elements/gstfakesrc.c: (gst_fake_src_class_init),
(gst_fake_src_create):
Fix handoff marshall.
* gst/elements/gstidentity.c: (gst_identity_class_init),
(gst_identity_transform_ip):
We're a real inplace element.
* gst/gstbus.c: (gst_bus_post):
Added some comments.
* tests/lat.c: (fakesrc), (fakesink), (simple), (queue), (main):
* tests/muxing/case1.c: (main):
* tests/sched/dynamic-pipeline.c: (main):
* tests/sched/interrupt1.c: (main):
* tests/sched/interrupt2.c: (main):
* tests/sched/interrupt3.c: (main):
* tests/sched/runxml.c: (main):
* tests/sched/sched-stress.c: (main):
* tests/seeking/seeking1.c: (event_received), (main):
* tests/threadstate/threadstate2.c: (bus_handler), (timeout_func),
(main):
* tests/threadstate/threadstate3.c: (main):
* tests/threadstate/threadstate4.c: (main):
* tests/threadstate/threadstate5.c: (main):
Fix the tests.
2005-07-22 11:47:10 +00:00
|
|
|
/* pass the message to the async queue, refcount passed in the queue */
|
2005-07-09 15:18:53 +00:00
|
|
|
GST_DEBUG_OBJECT (bus, "[msg %p] pushing on async queue", message);
|
2005-03-21 17:34:02 +00:00
|
|
|
g_mutex_lock (bus->queue_lock);
|
|
|
|
g_queue_push_tail (bus->queue, message);
|
|
|
|
g_mutex_unlock (bus->queue_lock);
|
2005-07-09 15:18:53 +00:00
|
|
|
GST_DEBUG_OBJECT (bus, "[msg %p] pushed on async queue", message);
|
2005-03-21 17:34:02 +00:00
|
|
|
|
2005-11-04 11:43:10 +00:00
|
|
|
/* FIXME cannot assume sources are only in the default context */
|
|
|
|
g_main_context_wakeup (main_context);
|
2005-05-26 10:48:53 +00:00
|
|
|
|
2005-03-21 17:34:02 +00:00
|
|
|
break;
|
|
|
|
case GST_BUS_ASYNC:
|
|
|
|
{
|
|
|
|
/* async delivery, we need a mutex and a cond to block
|
|
|
|
* on */
|
|
|
|
GMutex *lock = g_mutex_new ();
|
|
|
|
GCond *cond = g_cond_new ();
|
|
|
|
|
|
|
|
GST_MESSAGE_COND (message) = cond;
|
|
|
|
GST_MESSAGE_GET_LOCK (message) = lock;
|
|
|
|
|
2005-07-09 15:18:53 +00:00
|
|
|
GST_DEBUG_OBJECT (bus, "[msg %p] waiting for async delivery", message);
|
2005-03-21 17:34:02 +00:00
|
|
|
|
|
|
|
/* now we lock the message mutex, send the message to the async
|
2005-07-09 15:18:53 +00:00
|
|
|
* queue. When the message is handled by the app and destroyed,
|
2005-03-21 17:34:02 +00:00
|
|
|
* the cond will be signalled and we can continue */
|
|
|
|
g_mutex_lock (lock);
|
|
|
|
g_mutex_lock (bus->queue_lock);
|
|
|
|
g_queue_push_tail (bus->queue, message);
|
|
|
|
g_mutex_unlock (bus->queue_lock);
|
|
|
|
|
2005-11-04 11:43:10 +00:00
|
|
|
/* FIXME cannot assume sources are only in the default context */
|
|
|
|
g_main_context_wakeup (main_context);
|
2005-03-21 17:34:02 +00:00
|
|
|
|
|
|
|
/* now block till the message is freed */
|
|
|
|
g_cond_wait (cond, lock);
|
|
|
|
g_mutex_unlock (lock);
|
|
|
|
|
2005-07-09 15:18:53 +00:00
|
|
|
GST_DEBUG_OBJECT (bus, "[msg %p] delivered asynchronously", message);
|
2005-03-21 17:34:02 +00:00
|
|
|
|
|
|
|
g_mutex_free (lock);
|
|
|
|
g_cond_free (cond);
|
|
|
|
break;
|
|
|
|
}
|
2005-08-25 13:52:13 +00:00
|
|
|
default:
|
|
|
|
g_warning ("invalid return from bus sync handler");
|
|
|
|
break;
|
2005-03-21 17:34:02 +00:00
|
|
|
}
|
|
|
|
return TRUE;
|
2005-08-25 13:52:13 +00:00
|
|
|
|
|
|
|
/* ERRORS */
|
|
|
|
is_flushing:
|
|
|
|
{
|
|
|
|
GST_DEBUG_OBJECT (bus, "bus is flushing");
|
|
|
|
gst_message_unref (message);
|
2005-11-21 16:34:26 +00:00
|
|
|
GST_OBJECT_UNLOCK (bus);
|
2005-08-25 13:52:13 +00:00
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
2005-03-21 17:34:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* gst_bus_have_pending:
|
|
|
|
* @bus: a #GstBus to check
|
|
|
|
*
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
* Check if there are pending messages on the bus that
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
* should be handled.
|
2005-03-21 17:34:02 +00:00
|
|
|
*
|
2005-10-28 18:18:23 +00:00
|
|
|
* Returns: TRUE if there are messages on the bus to be handled, FALSE
|
|
|
|
* otherwise.
|
2005-03-21 17:34:02 +00:00
|
|
|
*
|
|
|
|
* MT safe.
|
|
|
|
*/
|
|
|
|
gboolean
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
gst_bus_have_pending (GstBus * bus)
|
2005-03-21 17:34:02 +00:00
|
|
|
{
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
gboolean result;
|
2005-03-21 17:34:02 +00:00
|
|
|
|
|
|
|
g_return_val_if_fail (GST_IS_BUS (bus), FALSE);
|
|
|
|
|
|
|
|
g_mutex_lock (bus->queue_lock);
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
/* see if there is a message on the bus */
|
|
|
|
result = !g_queue_is_empty (bus->queue);
|
2005-03-21 17:34:02 +00:00
|
|
|
g_mutex_unlock (bus->queue_lock);
|
|
|
|
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
return result;
|
2005-03-21 17:34:02 +00:00
|
|
|
}
|
|
|
|
|
2005-05-11 03:37:10 +00:00
|
|
|
/**
|
|
|
|
* gst_bus_set_flushing:
|
|
|
|
* @bus: a #GstBus
|
|
|
|
* @flushing: whether or not to flush the bus
|
|
|
|
*
|
|
|
|
* If @flushing, flush out and unref any messages queued in the bus. Releases
|
|
|
|
* references to the message origin objects. Will flush future messages until
|
|
|
|
* gst_bus_set_flushing() sets @flushing to #FALSE.
|
|
|
|
*
|
|
|
|
* MT safe.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
gst_bus_set_flushing (GstBus * bus, gboolean flushing)
|
|
|
|
{
|
|
|
|
GstMessage *message;
|
|
|
|
|
2005-11-21 16:34:26 +00:00
|
|
|
GST_OBJECT_LOCK (bus);
|
2005-05-11 03:37:10 +00:00
|
|
|
|
|
|
|
if (flushing) {
|
renamed GST_FLAGS macros to GST_OBJECT_FLAGS moved bitshift from macro to enum definition
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
* docs/gst/gstreamer-sections.txt:
* gst/base/gstbasesink.c: (gst_base_sink_init):
* gst/base/gstbasesrc.c: (gst_base_src_init),
(gst_base_src_get_range), (gst_base_src_check_get_range),
(gst_base_src_start), (gst_base_src_stop):
* gst/base/gstbasesrc.h:
* gst/elements/gstfakesrc.c: (gst_fake_src_set_property):
* gst/gstbin.c: (gst_bin_add_func), (gst_bin_remove_func),
(bin_element_is_sink), (reset_degree), (gst_bin_element_set_state),
(bin_bus_handler):
* gst/gstbin.h:
* gst/gstbuffer.h:
* gst/gstbus.c: (gst_bus_post), (gst_bus_set_flushing):
* gst/gstbus.h:
* gst/gstelement.c: (gst_element_is_locked_state),
(gst_element_set_locked_state), (gst_element_commit_state),
(gst_element_set_state):
* gst/gstelement.h:
* gst/gstindex.c: (gst_index_init):
* gst/gstindex.h:
* gst/gstminiobject.h:
* gst/gstobject.c: (gst_object_init), (gst_object_sink),
(gst_object_set_parent):
* gst/gstobject.h:
* gst/gstpad.c: (gst_pad_set_blocked_async), (gst_pad_is_blocked),
(gst_pad_get_caps_unlocked), (gst_pad_set_caps):
* gst/gstpad.h:
* gst/gstpadtemplate.h:
* gst/gstpipeline.c: (gst_pipeline_provide_clock_func),
(gst_pipeline_use_clock), (gst_pipeline_auto_clock):
* gst/gstpipeline.h:
* gst/indexers/gstfileindex.c: (gst_file_index_load),
(gst_file_index_commit):
* testsuite/bytestream/filepadsink.c: (gst_fp_sink_init):
* testsuite/pad/link.c: (gst_test_src_init),
(gst_test_filter_init), (gst_test_sink_init):
* testsuite/states/locked.c: (main):
renamed GST_FLAGS macros to GST_OBJECT_FLAGS
moved bitshift from macro to enum definition
2005-10-12 14:28:39 +00:00
|
|
|
GST_OBJECT_FLAG_SET (bus, GST_BUS_FLUSHING);
|
2005-05-11 03:37:10 +00:00
|
|
|
|
2005-07-29 15:34:52 +00:00
|
|
|
GST_DEBUG_OBJECT (bus, "set bus flushing");
|
2005-06-28 19:45:26 +00:00
|
|
|
|
2005-05-11 03:37:10 +00:00
|
|
|
while ((message = gst_bus_pop (bus)))
|
|
|
|
gst_message_unref (message);
|
|
|
|
} else {
|
2005-07-29 15:34:52 +00:00
|
|
|
GST_DEBUG_OBJECT (bus, "unset bus flushing");
|
renamed GST_FLAGS macros to GST_OBJECT_FLAGS moved bitshift from macro to enum definition
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
* docs/gst/gstreamer-sections.txt:
* gst/base/gstbasesink.c: (gst_base_sink_init):
* gst/base/gstbasesrc.c: (gst_base_src_init),
(gst_base_src_get_range), (gst_base_src_check_get_range),
(gst_base_src_start), (gst_base_src_stop):
* gst/base/gstbasesrc.h:
* gst/elements/gstfakesrc.c: (gst_fake_src_set_property):
* gst/gstbin.c: (gst_bin_add_func), (gst_bin_remove_func),
(bin_element_is_sink), (reset_degree), (gst_bin_element_set_state),
(bin_bus_handler):
* gst/gstbin.h:
* gst/gstbuffer.h:
* gst/gstbus.c: (gst_bus_post), (gst_bus_set_flushing):
* gst/gstbus.h:
* gst/gstelement.c: (gst_element_is_locked_state),
(gst_element_set_locked_state), (gst_element_commit_state),
(gst_element_set_state):
* gst/gstelement.h:
* gst/gstindex.c: (gst_index_init):
* gst/gstindex.h:
* gst/gstminiobject.h:
* gst/gstobject.c: (gst_object_init), (gst_object_sink),
(gst_object_set_parent):
* gst/gstobject.h:
* gst/gstpad.c: (gst_pad_set_blocked_async), (gst_pad_is_blocked),
(gst_pad_get_caps_unlocked), (gst_pad_set_caps):
* gst/gstpad.h:
* gst/gstpadtemplate.h:
* gst/gstpipeline.c: (gst_pipeline_provide_clock_func),
(gst_pipeline_use_clock), (gst_pipeline_auto_clock):
* gst/gstpipeline.h:
* gst/indexers/gstfileindex.c: (gst_file_index_load),
(gst_file_index_commit):
* testsuite/bytestream/filepadsink.c: (gst_fp_sink_init):
* testsuite/pad/link.c: (gst_test_src_init),
(gst_test_filter_init), (gst_test_sink_init):
* testsuite/states/locked.c: (main):
renamed GST_FLAGS macros to GST_OBJECT_FLAGS
moved bitshift from macro to enum definition
2005-10-12 14:28:39 +00:00
|
|
|
GST_OBJECT_FLAG_UNSET (bus, GST_BUS_FLUSHING);
|
2005-05-11 03:37:10 +00:00
|
|
|
}
|
|
|
|
|
2005-11-21 16:34:26 +00:00
|
|
|
GST_OBJECT_UNLOCK (bus);
|
2005-05-11 03:37:10 +00:00
|
|
|
}
|
|
|
|
|
2005-09-28 16:43:20 +00:00
|
|
|
|
2005-03-21 17:34:02 +00:00
|
|
|
/**
|
|
|
|
* gst_bus_pop:
|
|
|
|
* @bus: a #GstBus to pop
|
|
|
|
*
|
|
|
|
* Get a message from the bus.
|
|
|
|
*
|
|
|
|
* Returns: The #GstMessage that is on the bus, or NULL if the bus is empty.
|
|
|
|
*
|
|
|
|
* MT safe.
|
|
|
|
*/
|
|
|
|
GstMessage *
|
|
|
|
gst_bus_pop (GstBus * bus)
|
|
|
|
{
|
|
|
|
GstMessage *message;
|
|
|
|
|
|
|
|
g_return_val_if_fail (GST_IS_BUS (bus), NULL);
|
|
|
|
|
|
|
|
g_mutex_lock (bus->queue_lock);
|
|
|
|
message = g_queue_pop_head (bus->queue);
|
2005-09-29 18:25:50 +00:00
|
|
|
if (message)
|
2005-10-08 08:00:37 +00:00
|
|
|
GST_DEBUG_OBJECT (bus, "pop from bus, have %d messages, got message %p, %s",
|
|
|
|
g_queue_get_length (bus->queue) + 1, message,
|
2005-09-29 18:25:50 +00:00
|
|
|
gst_message_type_get_name (GST_MESSAGE_TYPE (message)));
|
|
|
|
else
|
2005-10-08 08:00:37 +00:00
|
|
|
GST_DEBUG_OBJECT (bus, "pop from bus, no messages");
|
|
|
|
g_mutex_unlock (bus->queue_lock);
|
2005-06-28 19:45:26 +00:00
|
|
|
|
2005-03-21 17:34:02 +00:00
|
|
|
return message;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* gst_bus_peek:
|
|
|
|
* @bus: a #GstBus
|
|
|
|
*
|
2005-10-15 15:30:24 +00:00
|
|
|
* Peek the message on the top of the bus' queue. The message will remain
|
2005-09-01 18:12:18 +00:00
|
|
|
* on the bus' message queue. A reference is returned, and needs to be unreffed
|
2005-07-29 15:34:52 +00:00
|
|
|
* by the caller.
|
2005-03-21 17:34:02 +00:00
|
|
|
*
|
|
|
|
* Returns: The #GstMessage that is on the bus, or NULL if the bus is empty.
|
|
|
|
*
|
|
|
|
* MT safe.
|
|
|
|
*/
|
|
|
|
GstMessage *
|
|
|
|
gst_bus_peek (GstBus * bus)
|
|
|
|
{
|
|
|
|
GstMessage *message;
|
|
|
|
|
|
|
|
g_return_val_if_fail (GST_IS_BUS (bus), NULL);
|
|
|
|
|
|
|
|
g_mutex_lock (bus->queue_lock);
|
|
|
|
message = g_queue_peek_head (bus->queue);
|
2005-07-29 15:34:52 +00:00
|
|
|
if (message)
|
|
|
|
gst_message_ref (message);
|
2005-03-21 17:34:02 +00:00
|
|
|
g_mutex_unlock (bus->queue_lock);
|
|
|
|
|
2005-07-29 15:34:52 +00:00
|
|
|
GST_DEBUG_OBJECT (bus, "peek on bus, got message %p", message);
|
2005-06-28 19:45:26 +00:00
|
|
|
|
2005-03-21 17:34:02 +00:00
|
|
|
return message;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* gst_bus_set_sync_handler:
|
|
|
|
* @bus: a #GstBus to install the handler on
|
|
|
|
* @func: The handler function to install
|
|
|
|
* @data: User data that will be sent to the handler function.
|
|
|
|
*
|
2005-08-18 15:31:28 +00:00
|
|
|
* Sets the synchronous handler on the bus. The function will be called
|
2005-03-21 17:34:02 +00:00
|
|
|
* every time a new message is posted on the bus. Note that the function
|
2005-08-18 15:31:28 +00:00
|
|
|
* will be called in the same thread context as the posting object. This
|
|
|
|
* function is usually only called by the creator of the bus. Applications
|
|
|
|
* should handle messages asynchronously using the gst_bus watch and poll
|
|
|
|
* functions.
|
2005-11-04 12:08:19 +00:00
|
|
|
*
|
|
|
|
* You cannot replace an existing sync_handler. You can pass NULL to this
|
|
|
|
* function, which will clear the existing handler.
|
2005-03-21 17:34:02 +00:00
|
|
|
*/
|
|
|
|
void
|
|
|
|
gst_bus_set_sync_handler (GstBus * bus, GstBusSyncHandler func, gpointer data)
|
|
|
|
{
|
|
|
|
g_return_if_fail (GST_IS_BUS (bus));
|
|
|
|
|
2005-11-21 16:34:26 +00:00
|
|
|
GST_OBJECT_LOCK (bus);
|
2005-08-18 15:31:28 +00:00
|
|
|
|
|
|
|
/* Assert if the user attempts to replace an existing sync_handler,
|
|
|
|
* other than to clear it */
|
2005-11-04 12:08:19 +00:00
|
|
|
if (func != NULL && bus->sync_handler != NULL)
|
|
|
|
goto no_replace;
|
2005-08-18 15:31:28 +00:00
|
|
|
|
2005-03-21 17:34:02 +00:00
|
|
|
bus->sync_handler = func;
|
|
|
|
bus->sync_handler_data = data;
|
2005-11-21 16:34:26 +00:00
|
|
|
GST_OBJECT_UNLOCK (bus);
|
2005-11-04 12:08:19 +00:00
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
no_replace:
|
|
|
|
{
|
2005-11-21 16:34:26 +00:00
|
|
|
GST_OBJECT_UNLOCK (bus);
|
2005-11-04 12:08:19 +00:00
|
|
|
g_warning ("cannot replace existing sync handler");
|
|
|
|
return;
|
|
|
|
}
|
2005-03-21 17:34:02 +00:00
|
|
|
}
|
|
|
|
|
2005-05-26 10:48:53 +00:00
|
|
|
/* GSource for the bus
|
2005-03-21 17:34:02 +00:00
|
|
|
*/
|
2005-05-26 10:48:53 +00:00
|
|
|
typedef struct
|
2005-03-21 17:34:02 +00:00
|
|
|
{
|
2005-05-26 10:48:53 +00:00
|
|
|
GSource source;
|
|
|
|
GstBus *bus;
|
|
|
|
} GstBusSource;
|
2005-03-21 17:34:02 +00:00
|
|
|
|
2005-06-28 19:45:26 +00:00
|
|
|
static gboolean
|
2005-05-26 10:48:53 +00:00
|
|
|
gst_bus_source_prepare (GSource * source, gint * timeout)
|
|
|
|
{
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
GstBusSource *bsrc = (GstBusSource *) source;
|
|
|
|
|
2005-05-26 10:48:53 +00:00
|
|
|
*timeout = -1;
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
return gst_bus_have_pending (bsrc->bus);
|
2005-03-21 17:34:02 +00:00
|
|
|
}
|
|
|
|
|
2005-06-28 19:45:26 +00:00
|
|
|
static gboolean
|
2005-05-26 10:48:53 +00:00
|
|
|
gst_bus_source_check (GSource * source)
|
2005-03-21 17:34:02 +00:00
|
|
|
{
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
GstBusSource *bsrc = (GstBusSource *) source;
|
|
|
|
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
return gst_bus_have_pending (bsrc->bus);
|
2005-05-26 10:48:53 +00:00
|
|
|
}
|
2005-03-21 17:34:02 +00:00
|
|
|
|
2005-06-28 19:45:26 +00:00
|
|
|
static gboolean
|
2005-05-26 10:48:53 +00:00
|
|
|
gst_bus_source_dispatch (GSource * source, GSourceFunc callback,
|
|
|
|
gpointer user_data)
|
2005-03-21 17:34:02 +00:00
|
|
|
{
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
GstBusFunc handler = (GstBusFunc) callback;
|
2005-05-26 10:48:53 +00:00
|
|
|
GstBusSource *bsource = (GstBusSource *) source;
|
2005-03-21 17:34:02 +00:00
|
|
|
GstMessage *message;
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
gboolean keep;
|
docs/design/: Some more docs in the works.
Original commit message from CVS:
* docs/design/part-dynamic.txt:
* docs/design/part-events.txt:
* docs/design/part-seeking.txt:
Some more docs in the works.
* gst/base/gstbasetransform.c: (gst_base_transform_transform_caps),
(gst_base_transform_getcaps), (gst_base_transform_configure_caps),
(gst_base_transform_setcaps), (gst_base_transform_get_size),
(gst_base_transform_buffer_alloc), (gst_base_transform_event),
(gst_base_transform_handle_buffer),
(gst_base_transform_sink_activate_push),
(gst_base_transform_src_activate_pull),
(gst_base_transform_set_passthrough),
(gst_base_transform_is_passthrough):
Refcounting fixes.
* gst/gstbus.c: (gst_bus_source_dispatch), (gst_bus_poll):
Cleanups.
* gst/gstevent.c: (gst_event_finalize):
Set SRC to NULL.
* gst/gstutils.c: (gst_element_unlink),
(gst_pad_get_parent_element), (gst_pad_proxy_getcaps),
(gst_pad_proxy_setcaps):
* gst/gstutils.h:
Add _get_parent_element() to get a pads parent as an element.
2005-07-18 08:28:48 +00:00
|
|
|
GstBus *bus;
|
|
|
|
|
|
|
|
g_return_val_if_fail (bsource != NULL, FALSE);
|
2005-03-21 17:34:02 +00:00
|
|
|
|
docs/design/: Some more docs in the works.
Original commit message from CVS:
* docs/design/part-dynamic.txt:
* docs/design/part-events.txt:
* docs/design/part-seeking.txt:
Some more docs in the works.
* gst/base/gstbasetransform.c: (gst_base_transform_transform_caps),
(gst_base_transform_getcaps), (gst_base_transform_configure_caps),
(gst_base_transform_setcaps), (gst_base_transform_get_size),
(gst_base_transform_buffer_alloc), (gst_base_transform_event),
(gst_base_transform_handle_buffer),
(gst_base_transform_sink_activate_push),
(gst_base_transform_src_activate_pull),
(gst_base_transform_set_passthrough),
(gst_base_transform_is_passthrough):
Refcounting fixes.
* gst/gstbus.c: (gst_bus_source_dispatch), (gst_bus_poll):
Cleanups.
* gst/gstevent.c: (gst_event_finalize):
Set SRC to NULL.
* gst/gstutils.c: (gst_element_unlink),
(gst_pad_get_parent_element), (gst_pad_proxy_getcaps),
(gst_pad_proxy_setcaps):
* gst/gstutils.h:
Add _get_parent_element() to get a pads parent as an element.
2005-07-18 08:28:48 +00:00
|
|
|
bus = bsource->bus;
|
2005-03-21 17:34:02 +00:00
|
|
|
|
docs/design/: Some more docs in the works.
Original commit message from CVS:
* docs/design/part-dynamic.txt:
* docs/design/part-events.txt:
* docs/design/part-seeking.txt:
Some more docs in the works.
* gst/base/gstbasetransform.c: (gst_base_transform_transform_caps),
(gst_base_transform_getcaps), (gst_base_transform_configure_caps),
(gst_base_transform_setcaps), (gst_base_transform_get_size),
(gst_base_transform_buffer_alloc), (gst_base_transform_event),
(gst_base_transform_handle_buffer),
(gst_base_transform_sink_activate_push),
(gst_base_transform_src_activate_pull),
(gst_base_transform_set_passthrough),
(gst_base_transform_is_passthrough):
Refcounting fixes.
* gst/gstbus.c: (gst_bus_source_dispatch), (gst_bus_poll):
Cleanups.
* gst/gstevent.c: (gst_event_finalize):
Set SRC to NULL.
* gst/gstutils.c: (gst_element_unlink),
(gst_pad_get_parent_element), (gst_pad_proxy_getcaps),
(gst_pad_proxy_setcaps):
* gst/gstutils.h:
Add _get_parent_element() to get a pads parent as an element.
2005-07-18 08:28:48 +00:00
|
|
|
g_return_val_if_fail (GST_IS_BUS (bus), FALSE);
|
|
|
|
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
message = gst_bus_pop (bus);
|
|
|
|
g_return_val_if_fail (message != NULL, FALSE);
|
2005-03-21 17:34:02 +00:00
|
|
|
|
docs/design/: Some more docs in the works.
Original commit message from CVS:
* docs/design/part-dynamic.txt:
* docs/design/part-events.txt:
* docs/design/part-seeking.txt:
Some more docs in the works.
* gst/base/gstbasetransform.c: (gst_base_transform_transform_caps),
(gst_base_transform_getcaps), (gst_base_transform_configure_caps),
(gst_base_transform_setcaps), (gst_base_transform_get_size),
(gst_base_transform_buffer_alloc), (gst_base_transform_event),
(gst_base_transform_handle_buffer),
(gst_base_transform_sink_activate_push),
(gst_base_transform_src_activate_pull),
(gst_base_transform_set_passthrough),
(gst_base_transform_is_passthrough):
Refcounting fixes.
* gst/gstbus.c: (gst_bus_source_dispatch), (gst_bus_poll):
Cleanups.
* gst/gstevent.c: (gst_event_finalize):
Set SRC to NULL.
* gst/gstutils.c: (gst_element_unlink),
(gst_pad_get_parent_element), (gst_pad_proxy_getcaps),
(gst_pad_proxy_setcaps):
* gst/gstutils.h:
Add _get_parent_element() to get a pads parent as an element.
2005-07-18 08:28:48 +00:00
|
|
|
if (!handler)
|
|
|
|
goto no_handler;
|
2005-05-26 10:48:53 +00:00
|
|
|
|
2005-07-29 15:34:52 +00:00
|
|
|
GST_DEBUG_OBJECT (bus, "source %p calling dispatch with %p", source, message);
|
2005-06-28 19:45:26 +00:00
|
|
|
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
keep = handler (bus, message, user_data);
|
2005-07-29 15:34:52 +00:00
|
|
|
gst_message_unref (message);
|
2005-03-21 17:34:02 +00:00
|
|
|
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
GST_DEBUG_OBJECT (bus, "source %p handler returns %d", source, keep);
|
|
|
|
|
|
|
|
return keep;
|
docs/design/: Some more docs in the works.
Original commit message from CVS:
* docs/design/part-dynamic.txt:
* docs/design/part-events.txt:
* docs/design/part-seeking.txt:
Some more docs in the works.
* gst/base/gstbasetransform.c: (gst_base_transform_transform_caps),
(gst_base_transform_getcaps), (gst_base_transform_configure_caps),
(gst_base_transform_setcaps), (gst_base_transform_get_size),
(gst_base_transform_buffer_alloc), (gst_base_transform_event),
(gst_base_transform_handle_buffer),
(gst_base_transform_sink_activate_push),
(gst_base_transform_src_activate_pull),
(gst_base_transform_set_passthrough),
(gst_base_transform_is_passthrough):
Refcounting fixes.
* gst/gstbus.c: (gst_bus_source_dispatch), (gst_bus_poll):
Cleanups.
* gst/gstevent.c: (gst_event_finalize):
Set SRC to NULL.
* gst/gstutils.c: (gst_element_unlink),
(gst_pad_get_parent_element), (gst_pad_proxy_getcaps),
(gst_pad_proxy_setcaps):
* gst/gstutils.h:
Add _get_parent_element() to get a pads parent as an element.
2005-07-18 08:28:48 +00:00
|
|
|
|
|
|
|
no_handler:
|
|
|
|
{
|
|
|
|
g_warning ("GstBus watch dispatched without callback\n"
|
|
|
|
"You must call g_source_connect().");
|
2005-07-29 15:34:52 +00:00
|
|
|
gst_message_unref (message);
|
docs/design/: Some more docs in the works.
Original commit message from CVS:
* docs/design/part-dynamic.txt:
* docs/design/part-events.txt:
* docs/design/part-seeking.txt:
Some more docs in the works.
* gst/base/gstbasetransform.c: (gst_base_transform_transform_caps),
(gst_base_transform_getcaps), (gst_base_transform_configure_caps),
(gst_base_transform_setcaps), (gst_base_transform_get_size),
(gst_base_transform_buffer_alloc), (gst_base_transform_event),
(gst_base_transform_handle_buffer),
(gst_base_transform_sink_activate_push),
(gst_base_transform_src_activate_pull),
(gst_base_transform_set_passthrough),
(gst_base_transform_is_passthrough):
Refcounting fixes.
* gst/gstbus.c: (gst_bus_source_dispatch), (gst_bus_poll):
Cleanups.
* gst/gstevent.c: (gst_event_finalize):
Set SRC to NULL.
* gst/gstutils.c: (gst_element_unlink),
(gst_pad_get_parent_element), (gst_pad_proxy_getcaps),
(gst_pad_proxy_setcaps):
* gst/gstutils.h:
Add _get_parent_element() to get a pads parent as an element.
2005-07-18 08:28:48 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
2005-03-21 17:34:02 +00:00
|
|
|
}
|
|
|
|
|
2005-06-28 19:45:26 +00:00
|
|
|
static void
|
2005-05-26 10:48:53 +00:00
|
|
|
gst_bus_source_finalize (GSource * source)
|
2005-03-21 17:34:02 +00:00
|
|
|
{
|
2005-05-26 10:48:53 +00:00
|
|
|
GstBusSource *bsource = (GstBusSource *) source;
|
|
|
|
|
2005-06-28 09:59:01 +00:00
|
|
|
gst_object_unref (bsource->bus);
|
gst/base/gsttypefindhelper.c (gst_type_find_helper): Unref any remaining buffer.
Original commit message from CVS:
2005-06-27 Andy Wingo <wingo@pobox.com>
* gst/base/gsttypefindhelper.c (gst_type_find_helper): Unref any
remaining buffer.
* gst/gsttrace.c (gst_alloc_trace_list_sorted): New helper,
returns a sorted copy of the trace list.
(gst_alloc_trace_print_live): New API, only prints traces with
live objects. Sort the list.
(gst_alloc_trace_print_all): Sort the list.
(gst_alloc_trace_print): Align columns.
* gst/elements/gstttypefindelement.c:
* gst/elements/gsttee.c:
* gst/base/gstbasesrc.c:
* gst/base/gstbasesink.c:
* gst/base/gstbasetransform.c:
* gst/gstqueue.c: Adapt for pad activation changes.
* gst/gstpipeline.c (gst_pipeline_init): Unref after parenting
sched.
(gst_pipeline_dispose): Drop ref on sched.
* gst/gstpad.c (gst_pad_init): Set the default activate func.
(gst_pad_activate_default): Push mode by default.
(pre_activate_switch, post_activate_switch): New stubs, things to
do before and after switching activation modes on pads.
(gst_pad_set_active): Take a boolean and not a mode, dispatch to
the pad's activate function to choose which mode to activate.
Shortcut on deactivation and call the right function directly.
(gst_pad_activate_pull): New API, (de)activates a pad in pull
mode.
(gst_pad_activate_push): New API, same for push mode.
(gst_pad_set_activate_function)
(gst_pad_set_activatepull_function)
(gst_pad_set_activatepush_function): Setters for new API.
* gst/gstminiobject.c (gst_mini_object_new, gst_mini_object_free):
Trace all miniobjects.
(gst_mini_object_make_writable): Unref the arg if we copy, like
gst_caps_make_writable.
* gst/gstmessage.c (_gst_message_initialize): No trace init.
* gst/gstghostpad.c (gst_proxy_pad_do_activate)
(gst_proxy_pad_do_activatepull, gst_proxy_pad_do_activatepush):
Adapt for new pad API.
* gst/gstevent.c (_gst_event_initialize): Don't initialize trace.
* gst/gstelement.h:
* gst/gstelement.c (gst_element_iterate_src_pads)
(gst_element_iterate_sink_pads): New API functions.
* gst/gstelement.c (iterator_fold_with_resync): New utility,
should fold into gstiterator.c in some form.
(gst_element_pads_activate): Simplified via use of fold and
delegation of decisions to gstpad->activate.
* gst/gstbus.c (gst_bus_source_finalize): Set the bus to NULL,
help in debugging.
* gst/gstbuffer.c (_gst_buffer_initialize): Ref the buffer type
class once in init, like gstmessage. Didn't run into this issue
but it seems correct. Don't initialize a trace, gstminiobject does
that.
* check/pipelines/simple_launch_lines.c (test_stop_from_app): New
test, runs fakesrc ! fakesink, stopping on ::handoff via a message
to the bus.
(assert_live_count): New util function, uses alloc traces to check
cleanup.
* check/gst/gstghostpad.c (test_ghost_pads): More refcount checks.
To be modified when unlink drops the internal pad.
2005-06-27 18:35:05 +00:00
|
|
|
bsource->bus = NULL;
|
2005-05-26 10:48:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static GSourceFuncs gst_bus_source_funcs = {
|
|
|
|
gst_bus_source_prepare,
|
|
|
|
gst_bus_source_check,
|
|
|
|
gst_bus_source_dispatch,
|
|
|
|
gst_bus_source_finalize
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* gst_bus_create_watch:
|
|
|
|
* @bus: a #GstBus to create the watch for
|
|
|
|
*
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
* Create watch for this bus. The GSource will be dispatched whenever
|
2005-10-15 15:30:24 +00:00
|
|
|
* a message is on the bus. After the GSource is dispatched, the
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
* message is popped off the bus and unreffed.
|
2005-05-26 10:48:53 +00:00
|
|
|
*
|
|
|
|
* Returns: A #GSource that can be added to a mainloop.
|
|
|
|
*/
|
|
|
|
GSource *
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
gst_bus_create_watch (GstBus * bus)
|
2005-05-26 10:48:53 +00:00
|
|
|
{
|
|
|
|
GstBusSource *source;
|
|
|
|
|
|
|
|
g_return_val_if_fail (GST_IS_BUS (bus), NULL);
|
|
|
|
|
|
|
|
source = (GstBusSource *) g_source_new (&gst_bus_source_funcs,
|
|
|
|
sizeof (GstBusSource));
|
2005-06-28 09:59:01 +00:00
|
|
|
gst_object_ref (bus);
|
2005-05-26 10:48:53 +00:00
|
|
|
source->bus = bus;
|
|
|
|
|
|
|
|
return (GSource *) source;
|
2005-03-21 17:34:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* gst_bus_add_watch_full:
|
2005-03-22 11:32:59 +00:00
|
|
|
* @bus: a #GstBus to create the watch for.
|
|
|
|
* @priority: The priority of the watch.
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
* @func: A function to call when a message is received.
|
|
|
|
* @user_data: user data passed to @func.
|
2005-03-22 11:32:59 +00:00
|
|
|
* @notify: the function to call when the source is removed.
|
2005-03-21 17:34:02 +00:00
|
|
|
*
|
2005-10-15 15:30:24 +00:00
|
|
|
* Adds a bus watch to the default main context with the given priority.
|
|
|
|
* If the func returns FALSE, the source will be removed.
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
*
|
2005-10-15 15:30:24 +00:00
|
|
|
* When the func is called, the message belongs to the caller; if you want to
|
2005-09-23 17:17:42 +00:00
|
|
|
* keep a copy of it, call gst_message_ref() before leaving the func.
|
2005-03-21 17:34:02 +00:00
|
|
|
*
|
2005-09-28 15:45:21 +00:00
|
|
|
* The watch can be removed using #g_source_remove().
|
|
|
|
*
|
2005-03-21 17:34:02 +00:00
|
|
|
* Returns: The event source id.
|
|
|
|
*
|
|
|
|
* MT safe.
|
|
|
|
*/
|
|
|
|
guint
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
gst_bus_add_watch_full (GstBus * bus, gint priority,
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
GstBusFunc func, gpointer user_data, GDestroyNotify notify)
|
2005-03-21 17:34:02 +00:00
|
|
|
{
|
|
|
|
guint id;
|
2005-05-26 10:48:53 +00:00
|
|
|
GSource *source;
|
2005-03-21 17:34:02 +00:00
|
|
|
|
|
|
|
g_return_val_if_fail (GST_IS_BUS (bus), 0);
|
|
|
|
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
source = gst_bus_create_watch (bus);
|
2005-03-21 17:34:02 +00:00
|
|
|
|
|
|
|
if (priority != G_PRIORITY_DEFAULT)
|
2005-05-26 10:48:53 +00:00
|
|
|
g_source_set_priority (source, priority);
|
2005-03-21 17:34:02 +00:00
|
|
|
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
g_source_set_callback (source, (GSourceFunc) func, user_data, notify);
|
2005-03-21 17:34:02 +00:00
|
|
|
|
2005-05-26 10:48:53 +00:00
|
|
|
id = g_source_attach (source, NULL);
|
|
|
|
g_source_unref (source);
|
2005-03-21 17:34:02 +00:00
|
|
|
|
2005-08-15 18:15:38 +00:00
|
|
|
GST_DEBUG_OBJECT (bus, "New source %p", source);
|
2005-03-21 17:34:02 +00:00
|
|
|
return id;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* gst_bus_add_watch:
|
|
|
|
* @bus: a #GstBus to create the watch for
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
* @func: A function to call when a message is received.
|
|
|
|
* @user_data: user data passed to @func.
|
2005-03-21 17:34:02 +00:00
|
|
|
*
|
2005-09-23 17:17:42 +00:00
|
|
|
* Adds a bus watch to the default main context with the default priority.
|
2005-03-21 17:34:02 +00:00
|
|
|
*
|
2005-09-28 15:45:21 +00:00
|
|
|
* The watch can be removed using #g_source_remove().
|
|
|
|
*
|
2005-03-21 17:34:02 +00:00
|
|
|
* Returns: The event source id.
|
|
|
|
*
|
|
|
|
* MT safe.
|
|
|
|
*/
|
|
|
|
guint
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
gst_bus_add_watch (GstBus * bus, GstBusFunc func, gpointer user_data)
|
2005-03-21 17:34:02 +00:00
|
|
|
{
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
return gst_bus_add_watch_full (bus, G_PRIORITY_DEFAULT, func,
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
user_data, NULL);
|
2005-03-21 17:34:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
GMainLoop *loop;
|
|
|
|
guint timeout_id;
|
2005-07-29 15:34:52 +00:00
|
|
|
gboolean source_running;
|
2005-03-21 17:34:02 +00:00
|
|
|
GstMessageType events;
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
GstMessage *message;
|
2005-03-21 17:34:02 +00:00
|
|
|
} GstBusPollData;
|
|
|
|
|
2005-11-10 18:15:24 +00:00
|
|
|
static void
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
poll_func (GstBus * bus, GstMessage * message, GstBusPollData * poll_data)
|
2005-03-21 17:34:02 +00:00
|
|
|
{
|
2005-09-20 17:30:35 +00:00
|
|
|
if (!g_main_loop_is_running (poll_data->loop)) {
|
|
|
|
GST_DEBUG ("mainloop %p not running", poll_data->loop);
|
2005-11-10 18:15:24 +00:00
|
|
|
return;
|
2005-09-20 17:30:35 +00:00
|
|
|
}
|
2005-07-29 15:34:52 +00:00
|
|
|
|
2005-03-21 17:34:02 +00:00
|
|
|
if (GST_MESSAGE_TYPE (message) & poll_data->events) {
|
2005-11-10 18:15:24 +00:00
|
|
|
g_return_if_fail (poll_data->message == NULL);
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
/* keep ref to message */
|
|
|
|
poll_data->message = gst_message_ref (message);
|
2005-09-20 17:30:35 +00:00
|
|
|
GST_DEBUG ("mainloop %p quit", poll_data->loop);
|
2005-07-29 15:34:52 +00:00
|
|
|
g_main_loop_quit (poll_data->loop);
|
2005-03-21 17:34:02 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
poll_timeout (GstBusPollData * poll_data)
|
|
|
|
{
|
2005-09-20 17:30:35 +00:00
|
|
|
GST_DEBUG ("mainloop %p quit", poll_data->loop);
|
2005-03-21 17:34:02 +00:00
|
|
|
g_main_loop_quit (poll_data->loop);
|
2005-07-29 15:34:52 +00:00
|
|
|
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
/* we don't remove the GSource as this would free our poll_data,
|
|
|
|
* which we still need */
|
|
|
|
return TRUE;
|
2005-03-21 17:34:02 +00:00
|
|
|
}
|
|
|
|
|
2005-07-29 15:34:52 +00:00
|
|
|
static void
|
2005-11-10 18:15:24 +00:00
|
|
|
poll_destroy (GstBusPollData * poll_data, gpointer unused)
|
2005-07-29 15:34:52 +00:00
|
|
|
{
|
|
|
|
poll_data->source_running = FALSE;
|
|
|
|
if (!poll_data->timeout_id) {
|
|
|
|
g_main_loop_unref (poll_data->loop);
|
|
|
|
g_free (poll_data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
poll_destroy_timeout (GstBusPollData * poll_data)
|
|
|
|
{
|
|
|
|
poll_data->timeout_id = 0;
|
|
|
|
if (!poll_data->source_running) {
|
|
|
|
g_main_loop_unref (poll_data->loop);
|
|
|
|
g_free (poll_data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-03-21 17:34:02 +00:00
|
|
|
/**
|
|
|
|
* gst_bus_poll:
|
|
|
|
* @bus: a #GstBus
|
|
|
|
* @events: a mask of #GstMessageType, representing the set of message types to
|
|
|
|
* poll for.
|
|
|
|
* @timeout: the poll timeout, as a #GstClockTimeDiff, or -1 to poll indefinitely.
|
|
|
|
*
|
2005-10-28 18:18:23 +00:00
|
|
|
* Poll the bus for messages. Will block while waiting for messages to come.
|
|
|
|
* You can specify a maximum time to poll with the @timeout parameter. If
|
|
|
|
* @timeout is negative, this function will block indefinitely.
|
2005-03-21 17:34:02 +00:00
|
|
|
*
|
2005-09-28 16:43:20 +00:00
|
|
|
* All messages not in @events will be popped off the bus and will be ignored.
|
|
|
|
*
|
2005-11-10 18:15:24 +00:00
|
|
|
* Because poll is implemented using the "message" signal enabled by
|
|
|
|
* gst_bus_add_signal_watch(), calling gst_bus_poll() will cause the "message"
|
|
|
|
* signal to be emitted for every message that poll sees. Thus a "message"
|
|
|
|
* signal handler will see the same messages that this function sees -- neither
|
|
|
|
* will steal messages from the other.
|
|
|
|
*
|
|
|
|
* This function will run a main loop from the default main context when
|
|
|
|
* polling.
|
docs/design/: Some more docs in the works.
Original commit message from CVS:
* docs/design/part-dynamic.txt:
* docs/design/part-events.txt:
* docs/design/part-seeking.txt:
Some more docs in the works.
* gst/base/gstbasetransform.c: (gst_base_transform_transform_caps),
(gst_base_transform_getcaps), (gst_base_transform_configure_caps),
(gst_base_transform_setcaps), (gst_base_transform_get_size),
(gst_base_transform_buffer_alloc), (gst_base_transform_event),
(gst_base_transform_handle_buffer),
(gst_base_transform_sink_activate_push),
(gst_base_transform_src_activate_pull),
(gst_base_transform_set_passthrough),
(gst_base_transform_is_passthrough):
Refcounting fixes.
* gst/gstbus.c: (gst_bus_source_dispatch), (gst_bus_poll):
Cleanups.
* gst/gstevent.c: (gst_event_finalize):
Set SRC to NULL.
* gst/gstutils.c: (gst_element_unlink),
(gst_pad_get_parent_element), (gst_pad_proxy_getcaps),
(gst_pad_proxy_setcaps):
* gst/gstutils.h:
Add _get_parent_element() to get a pads parent as an element.
2005-07-18 08:28:48 +00:00
|
|
|
*
|
2005-10-15 15:30:24 +00:00
|
|
|
* Returns: The message that was received, or NULL if the poll timed out.
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
* The message is taken from the bus and needs to be unreffed after usage.
|
2005-03-21 17:34:02 +00:00
|
|
|
*/
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
GstMessage *
|
2005-03-21 17:34:02 +00:00
|
|
|
gst_bus_poll (GstBus * bus, GstMessageType events, GstClockTimeDiff timeout)
|
|
|
|
{
|
2005-07-29 15:34:52 +00:00
|
|
|
GstBusPollData *poll_data;
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
GstMessage *ret;
|
2005-11-10 18:15:24 +00:00
|
|
|
gulong id;
|
2005-03-21 17:34:02 +00:00
|
|
|
|
2005-07-29 15:34:52 +00:00
|
|
|
poll_data = g_new0 (GstBusPollData, 1);
|
|
|
|
poll_data->source_running = TRUE;
|
|
|
|
poll_data->loop = g_main_loop_new (NULL, FALSE);
|
|
|
|
poll_data->events = events;
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
poll_data->message = NULL;
|
2005-07-29 15:34:52 +00:00
|
|
|
|
2005-03-21 17:34:02 +00:00
|
|
|
if (timeout >= 0)
|
2005-07-29 15:34:52 +00:00
|
|
|
poll_data->timeout_id = g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE,
|
|
|
|
timeout / GST_MSECOND, (GSourceFunc) poll_timeout, poll_data,
|
|
|
|
(GDestroyNotify) poll_destroy_timeout);
|
docs/design/: Some more docs in the works.
Original commit message from CVS:
* docs/design/part-dynamic.txt:
* docs/design/part-events.txt:
* docs/design/part-seeking.txt:
Some more docs in the works.
* gst/base/gstbasetransform.c: (gst_base_transform_transform_caps),
(gst_base_transform_getcaps), (gst_base_transform_configure_caps),
(gst_base_transform_setcaps), (gst_base_transform_get_size),
(gst_base_transform_buffer_alloc), (gst_base_transform_event),
(gst_base_transform_handle_buffer),
(gst_base_transform_sink_activate_push),
(gst_base_transform_src_activate_pull),
(gst_base_transform_set_passthrough),
(gst_base_transform_is_passthrough):
Refcounting fixes.
* gst/gstbus.c: (gst_bus_source_dispatch), (gst_bus_poll):
Cleanups.
* gst/gstevent.c: (gst_event_finalize):
Set SRC to NULL.
* gst/gstutils.c: (gst_element_unlink),
(gst_pad_get_parent_element), (gst_pad_proxy_getcaps),
(gst_pad_proxy_setcaps):
* gst/gstutils.h:
Add _get_parent_element() to get a pads parent as an element.
2005-07-18 08:28:48 +00:00
|
|
|
else
|
2005-07-29 15:34:52 +00:00
|
|
|
poll_data->timeout_id = 0;
|
docs/design/: Some more docs in the works.
Original commit message from CVS:
* docs/design/part-dynamic.txt:
* docs/design/part-events.txt:
* docs/design/part-seeking.txt:
Some more docs in the works.
* gst/base/gstbasetransform.c: (gst_base_transform_transform_caps),
(gst_base_transform_getcaps), (gst_base_transform_configure_caps),
(gst_base_transform_setcaps), (gst_base_transform_get_size),
(gst_base_transform_buffer_alloc), (gst_base_transform_event),
(gst_base_transform_handle_buffer),
(gst_base_transform_sink_activate_push),
(gst_base_transform_src_activate_pull),
(gst_base_transform_set_passthrough),
(gst_base_transform_is_passthrough):
Refcounting fixes.
* gst/gstbus.c: (gst_bus_source_dispatch), (gst_bus_poll):
Cleanups.
* gst/gstevent.c: (gst_event_finalize):
Set SRC to NULL.
* gst/gstutils.c: (gst_element_unlink),
(gst_pad_get_parent_element), (gst_pad_proxy_getcaps),
(gst_pad_proxy_setcaps):
* gst/gstutils.h:
Add _get_parent_element() to get a pads parent as an element.
2005-07-18 08:28:48 +00:00
|
|
|
|
2005-11-10 18:15:24 +00:00
|
|
|
id = g_signal_connect_data (bus, "message", G_CALLBACK (poll_func), poll_data,
|
|
|
|
(GClosureNotify) poll_destroy, 0);
|
|
|
|
|
|
|
|
/* these can be nested, so it's ok */
|
|
|
|
gst_bus_add_signal_watch (bus);
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
|
2005-09-20 17:30:35 +00:00
|
|
|
GST_DEBUG ("running mainloop %p", poll_data->loop);
|
2005-07-29 15:34:52 +00:00
|
|
|
g_main_loop_run (poll_data->loop);
|
2005-09-20 17:30:35 +00:00
|
|
|
GST_DEBUG ("mainloop stopped %p", poll_data->loop);
|
2005-11-10 18:15:24 +00:00
|
|
|
|
|
|
|
gst_bus_remove_signal_watch (bus);
|
|
|
|
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
/* holds a ref */
|
|
|
|
ret = poll_data->message;
|
docs/design/: Some more docs in the works.
Original commit message from CVS:
* docs/design/part-dynamic.txt:
* docs/design/part-events.txt:
* docs/design/part-seeking.txt:
Some more docs in the works.
* gst/base/gstbasetransform.c: (gst_base_transform_transform_caps),
(gst_base_transform_getcaps), (gst_base_transform_configure_caps),
(gst_base_transform_setcaps), (gst_base_transform_get_size),
(gst_base_transform_buffer_alloc), (gst_base_transform_event),
(gst_base_transform_handle_buffer),
(gst_base_transform_sink_activate_push),
(gst_base_transform_src_activate_pull),
(gst_base_transform_set_passthrough),
(gst_base_transform_is_passthrough):
Refcounting fixes.
* gst/gstbus.c: (gst_bus_source_dispatch), (gst_bus_poll):
Cleanups.
* gst/gstevent.c: (gst_event_finalize):
Set SRC to NULL.
* gst/gstutils.c: (gst_element_unlink),
(gst_pad_get_parent_element), (gst_pad_proxy_getcaps),
(gst_pad_proxy_setcaps):
* gst/gstutils.h:
Add _get_parent_element() to get a pads parent as an element.
2005-07-18 08:28:48 +00:00
|
|
|
|
2005-07-29 15:34:52 +00:00
|
|
|
if (poll_data->timeout_id)
|
|
|
|
g_source_remove (poll_data->timeout_id);
|
2005-03-21 17:34:02 +00:00
|
|
|
|
2005-11-10 18:15:24 +00:00
|
|
|
/* poll_data will be freed now */
|
|
|
|
g_signal_handler_disconnect (bus, id);
|
2005-03-21 17:34:02 +00:00
|
|
|
|
GstBusHandler -> GstBusFunc, return value has the same meaning as any other GSource (FALSE == remove source).
Original commit message from CVS:
* check/gst/gstbin.c: (pop_messages), (GST_START_TEST):
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
* check/gst/gstpipeline.c: (GST_START_TEST):
* check/pipelines/cleanup.c: (run_pipeline):
* check/pipelines/simple_launch_lines.c: (run_pipeline),
(GST_START_TEST):
* gst/gstbus.c: (gst_bus_have_pending), (gst_bus_source_prepare),
(gst_bus_source_check), (gst_bus_source_dispatch),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (poll_func), (poll_timeout), (gst_bus_poll):
* gst/gstbus.h:
* tools/gst-launch.c: (event_loop):
* tools/gst-md5sum.c: (event_loop):
GstBusHandler -> GstBusFunc, return value has the same meaning as
any other GSource (FALSE == remove source).
_add_watch() and _add_watch_full() now take a MessageType mask to
only handle specific types of messages.
_poll() returns the GstMessage instead of the message type to avoid
race conditions.
_have_pending() takes a MessageType mask now too.
Added testsuite for multiple bus watches.
Fix testsuites and applications for new bus API.
2005-09-19 11:18:03 +00:00
|
|
|
GST_DEBUG_OBJECT (bus, "finished poll with message %p", ret);
|
2005-03-21 17:34:02 +00:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
2005-09-28 16:43:20 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* gst_bus_async_signal_func:
|
|
|
|
* @bus: a #GstBus
|
2005-10-28 18:18:23 +00:00
|
|
|
* @message: the #GstMessage received
|
2005-09-28 16:43:20 +00:00
|
|
|
* @data: user data
|
|
|
|
*
|
2005-10-15 15:30:24 +00:00
|
|
|
* A helper GstBusFunc that can be used to convert all asynchronous messages
|
2005-09-28 16:43:20 +00:00
|
|
|
* into signals.
|
|
|
|
*
|
|
|
|
* Returns: TRUE
|
|
|
|
*/
|
|
|
|
gboolean
|
|
|
|
gst_bus_async_signal_func (GstBus * bus, GstMessage * message, gpointer data)
|
|
|
|
{
|
|
|
|
GQuark detail = 0;
|
|
|
|
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
g_return_val_if_fail (GST_IS_BUS (bus), TRUE);
|
|
|
|
g_return_val_if_fail (message != NULL, TRUE);
|
|
|
|
|
2005-09-28 16:43:20 +00:00
|
|
|
detail = gst_message_type_to_quark (GST_MESSAGE_TYPE (message));
|
|
|
|
|
|
|
|
g_signal_emit (bus, gst_bus_signals[ASYNC_MESSAGE], detail, message);
|
|
|
|
|
|
|
|
/* we never remove this source based on signal emission return values */
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* gst_bus_sync_signal_handler:
|
|
|
|
* @bus: a #GstBus
|
2005-10-28 18:18:23 +00:00
|
|
|
* @message: the #GstMessage received
|
2005-09-28 16:43:20 +00:00
|
|
|
* @data: user data
|
|
|
|
*
|
|
|
|
* A helper GstBusSyncHandler that can be used to convert all synchronous
|
|
|
|
* messages into signals.
|
|
|
|
*
|
|
|
|
* Returns: GST_BUS_PASS
|
|
|
|
*/
|
|
|
|
GstBusSyncReply
|
|
|
|
gst_bus_sync_signal_handler (GstBus * bus, GstMessage * message, gpointer data)
|
|
|
|
{
|
|
|
|
GQuark detail = 0;
|
|
|
|
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
g_return_val_if_fail (GST_IS_BUS (bus), GST_BUS_DROP);
|
|
|
|
g_return_val_if_fail (message != NULL, GST_BUS_DROP);
|
|
|
|
|
2005-09-28 16:43:20 +00:00
|
|
|
detail = gst_message_type_to_quark (GST_MESSAGE_TYPE (message));
|
|
|
|
|
|
|
|
g_signal_emit (bus, gst_bus_signals[SYNC_MESSAGE], detail, message);
|
|
|
|
|
|
|
|
return GST_BUS_PASS;
|
|
|
|
}
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
|
2006-02-10 16:04:59 +00:00
|
|
|
/**
|
|
|
|
* gst_bus_enable_sync_message_emission:
|
|
|
|
* @bus: a #GstBus on which you want to receive the "sync-message" signal
|
|
|
|
*
|
|
|
|
* Instructs GStreamer to emit the sync-message signal after running the bus's
|
|
|
|
* sync handler. This function is here so that code can ensure that they can
|
|
|
|
* synchronously receive messages without having to affect what the bin's sync
|
|
|
|
* handler is.
|
|
|
|
*
|
|
|
|
* This function may be called multiple times. To clean up, the caller is
|
|
|
|
* responsible for calling gst_bus_disable_sync_message_emission() as many times
|
|
|
|
* as this function is called.
|
|
|
|
*
|
|
|
|
* While this function looks similar to gst_bus_add_signal_watch(), it is not
|
|
|
|
* exactly the same -- this function enables <i>synchronous</i> emission of
|
|
|
|
* signals when messages arrive; gst_bus_add_signal_watch adds an idle callback
|
|
|
|
* to pop messages off the bus <i>asynchronously</a>. The sync-message signal
|
|
|
|
* comes from the thread of whatever object posted the message; the message
|
|
|
|
* signal is marshalled to the main thread via the main loop.
|
|
|
|
*
|
|
|
|
* MT safe.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
gst_bus_enable_sync_message_emission (GstBus * bus)
|
|
|
|
{
|
|
|
|
g_return_if_fail (GST_IS_BUS (bus));
|
|
|
|
|
|
|
|
GST_OBJECT_LOCK (bus);
|
|
|
|
|
|
|
|
bus->priv->num_sync_message_emitters++;
|
|
|
|
|
|
|
|
GST_OBJECT_UNLOCK (bus);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* gst_bus_disable_sync_message_emission:
|
|
|
|
* @bus: a #GstBus on which you previously called
|
|
|
|
* gst_bus_enable_sync_message_emission()
|
|
|
|
*
|
|
|
|
* Instructs GStreamer to stop emitting the sync-message signal for this bus.
|
|
|
|
* See gst_bus_enable_sync_message_emission() for more information.
|
|
|
|
*
|
|
|
|
* In the event that multiple pieces of code have called
|
|
|
|
* gst_bus_enable_sync_message_emission(), the sync-message emissions will only
|
|
|
|
* be stopped after all calls to gst_bus_enable_sync_message_emission() were
|
|
|
|
* "cancelled" by calling this function. In this way the semantics are exactly
|
|
|
|
* the same as gst_object_ref(); that which calls enable should also call
|
|
|
|
* disable.
|
|
|
|
*
|
|
|
|
* MT safe.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
gst_bus_disable_sync_message_emission (GstBus * bus)
|
|
|
|
{
|
|
|
|
g_return_if_fail (GST_IS_BUS (bus));
|
|
|
|
|
|
|
|
g_return_if_fail (bus->num_signal_watchers == 0);
|
|
|
|
|
|
|
|
GST_OBJECT_LOCK (bus);
|
|
|
|
|
|
|
|
bus->priv->num_sync_message_emitters--;
|
|
|
|
|
|
|
|
GST_OBJECT_UNLOCK (bus);
|
|
|
|
}
|
|
|
|
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
/**
|
2005-11-22 11:25:01 +00:00
|
|
|
* gst_bus_add_signal_watch_full:
|
2006-01-20 19:01:59 +00:00
|
|
|
* @bus: a #GstBus on which you want to receive the "message" signal
|
2005-11-22 11:25:01 +00:00
|
|
|
* @priority: The priority of the watch.
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
*
|
2005-11-22 11:25:01 +00:00
|
|
|
* Adds a bus signal watch to the default main context with the given priority.
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
* After calling this statement, the bus will emit the message signal for each
|
|
|
|
* message posted on the bus.
|
|
|
|
*
|
2005-09-29 16:04:31 +00:00
|
|
|
* This function may be called multiple times. To clean up, the caller is
|
|
|
|
* responsible for calling gst_bus_remove_signal_watch() as many times as this
|
|
|
|
* function is called.
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
*
|
|
|
|
* MT safe.
|
|
|
|
*/
|
2005-09-29 16:04:31 +00:00
|
|
|
void
|
2005-11-22 11:25:01 +00:00
|
|
|
gst_bus_add_signal_watch_full (GstBus * bus, gint priority)
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
{
|
2005-09-29 16:04:31 +00:00
|
|
|
g_return_if_fail (GST_IS_BUS (bus));
|
|
|
|
|
|
|
|
/* I know the callees don't take this lock, so go ahead and abuse it */
|
2005-11-21 16:34:26 +00:00
|
|
|
GST_OBJECT_LOCK (bus);
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
|
2005-09-29 16:04:31 +00:00
|
|
|
if (bus->num_signal_watchers > 0)
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
g_assert (bus->signal_watch_id == 0);
|
|
|
|
|
|
|
|
bus->signal_watch_id =
|
2005-11-22 11:25:01 +00:00
|
|
|
gst_bus_add_watch_full (bus, priority, gst_bus_async_signal_func, NULL,
|
|
|
|
NULL);
|
2005-09-29 16:04:31 +00:00
|
|
|
|
|
|
|
done:
|
|
|
|
|
|
|
|
bus->num_signal_watchers++;
|
|
|
|
|
2005-11-21 16:34:26 +00:00
|
|
|
GST_OBJECT_UNLOCK (bus);
|
2005-09-29 16:04:31 +00:00
|
|
|
}
|
|
|
|
|
2005-11-22 11:25:01 +00:00
|
|
|
/**
|
|
|
|
* gst_bus_add_signal_watch:
|
2006-01-20 19:01:59 +00:00
|
|
|
* @bus: a #GstBus on which you want to receive the "message" signal
|
2005-11-22 11:25:01 +00:00
|
|
|
*
|
2006-01-20 19:01:59 +00:00
|
|
|
* Adds a bus signal watch to the default main context with the default
|
|
|
|
* priority.
|
2005-11-22 11:25:01 +00:00
|
|
|
* After calling this statement, the bus will emit the message signal for each
|
|
|
|
* message posted on the bus.
|
|
|
|
*
|
|
|
|
* This function may be called multiple times. To clean up, the caller is
|
|
|
|
* responsible for calling gst_bus_remove_signal_watch() as many times as this
|
|
|
|
* function is called.
|
|
|
|
*
|
|
|
|
* MT safe.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
gst_bus_add_signal_watch (GstBus * bus)
|
|
|
|
{
|
|
|
|
gst_bus_add_signal_watch_full (bus, G_PRIORITY_DEFAULT);
|
|
|
|
}
|
|
|
|
|
2005-09-29 16:04:31 +00:00
|
|
|
/**
|
|
|
|
* gst_bus_remove_signal_watch:
|
|
|
|
* @bus: a #GstBus you previously added a signal watch to
|
|
|
|
*
|
|
|
|
* Removes a signal watch previously added with gst_bus_add_signal_watch().
|
|
|
|
*
|
|
|
|
* MT safe.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
gst_bus_remove_signal_watch (GstBus * bus)
|
|
|
|
{
|
|
|
|
g_return_if_fail (GST_IS_BUS (bus));
|
|
|
|
|
|
|
|
/* I know the callees don't take this lock, so go ahead and abuse it */
|
2005-11-21 16:34:26 +00:00
|
|
|
GST_OBJECT_LOCK (bus);
|
2005-09-29 16:04:31 +00:00
|
|
|
|
|
|
|
if (bus->num_signal_watchers == 0)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
bus->num_signal_watchers--;
|
|
|
|
|
|
|
|
if (bus->num_signal_watchers > 0)
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
g_source_remove (bus->signal_watch_id);
|
|
|
|
bus->signal_watch_id = 0;
|
|
|
|
|
|
|
|
done:
|
2005-11-21 16:34:26 +00:00
|
|
|
GST_OBJECT_UNLOCK (bus);
|
2005-09-29 16:04:31 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
error:
|
|
|
|
{
|
|
|
|
g_critical ("Bus %s has no signal watches attached", GST_OBJECT_NAME (bus));
|
2005-11-21 16:34:26 +00:00
|
|
|
GST_OBJECT_UNLOCK (bus);
|
2005-09-29 16:04:31 +00:00
|
|
|
return;
|
|
|
|
}
|
check/gst/gstbin.c: Change for new bus API.
Original commit message from CVS:
* check/gst/gstbin.c: (GST_START_TEST):
Change for new bus API.
* check/gst/gstbus.c: (message_func_eos), (message_func_app),
(send_messages), (GST_START_TEST), (gstbus_suite):
Change for new bus signal API.
* gst/gstbus.c: (gst_bus_class_init), (gst_bus_have_pending),
(gst_bus_source_prepare), (gst_bus_source_check),
(gst_bus_create_watch), (gst_bus_add_watch_full),
(gst_bus_add_watch), (gst_bus_poll), (gst_bus_async_signal_func),
(gst_bus_sync_signal_handler), (gst_bus_add_signal_watch):
* gst/gstbus.h:
Remove support for multiple GSources operating on different
message types as it is too complex and unneeded when using
signals.
Added support for receiving signals from the bus.
2005-09-29 13:07:37 +00:00
|
|
|
}
|