projects
/
platform
/
upstream
/
gstreamer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
docs: convert NULL, TRUE, and FALSE to %NULL, %TRUE, and %FALSE
[platform/upstream/gstreamer.git]
/
gst
/
gstbus.h
diff --git
a/gst/gstbus.h
b/gst/gstbus.h
index
818c38d
..
92d2160
100644
(file)
--- a/
gst/gstbus.h
+++ b/
gst/gstbus.h
@@
-15,8
+15,8
@@
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
*
* 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., 5
9 Temple Place - Suite 330
,
- * Boston, MA 0211
1-1307
, USA.
+ * Free Software Foundation, Inc., 5
1 Franklin St, Fifth Floor
,
+ * Boston, MA 0211
0-1301
, USA.
*/
#ifndef __GST_BUS_H__
*/
#ifndef __GST_BUS_H__
@@
-28,7
+28,6
@@
typedef struct _GstBusClass GstBusClass;
#include <gst/gstmessage.h>
#include <gst/gstclock.h>
#include <gst/gstmessage.h>
#include <gst/gstclock.h>
-#include <gst/gstatomicqueue.h>
G_BEGIN_DECLS
G_BEGIN_DECLS
@@
-73,7
+72,7
@@
typedef enum
* GstBusSyncHandler:
* @bus: the #GstBus that sent the message
* @message: the #GstMessage
* GstBusSyncHandler:
* @bus: the #GstBus that sent the message
* @message: the #GstMessage
- * @data: user data that has been given, when registering the handler
+ * @
user_
data: user data that has been given, when registering the handler
*
* Handler will be invoked synchronously, when a new message has been injected
* into the bus. This function is mostly used internally. Only one sync handler
*
* Handler will be invoked synchronously, when a new message has been injected
* into the bus. This function is mostly used internally. Only one sync handler
@@
-84,13
+83,13
@@
typedef enum
*
* Returns: #GstBusSyncReply stating what to do with the message
*/
*
* Returns: #GstBusSyncReply stating what to do with the message
*/
-typedef GstBusSyncReply (*GstBusSyncHandler) (GstBus * bus, GstMessage * message, gpointer data);
+typedef GstBusSyncReply (*GstBusSyncHandler) (GstBus * bus, GstMessage * message, gpointer
user_
data);
/**
* GstBusFunc:
* @bus: the #GstBus that sent the message
* @message: the #GstMessage
/**
* GstBusFunc:
* @bus: the #GstBus that sent the message
* @message: the #GstMessage
- * @data: user data that has been given, when registering the handler
+ * @
user_
data: user data that has been given, when registering the handler
*
* Specifies the type of function passed to gst_bus_add_watch() or
* gst_bus_add_watch_full(), which is called from the mainloop when a message
*
* Specifies the type of function passed to gst_bus_add_watch() or
* gst_bus_add_watch_full(), which is called from the mainloop when a message
@@
-100,11
+99,11
@@
typedef GstBusSyncReply (*GstBusSyncHandler) (GstBus * bus, GstMessage * mess
* function so it should not be freed in the function.
*
* Note that this function is used as a GSourceFunc which means that returning
* function so it should not be freed in the function.
*
* Note that this function is used as a GSourceFunc which means that returning
- * FALSE will remove the GSource from the mainloop.
+ *
%
FALSE will remove the GSource from the mainloop.
*
* Returns: %FALSE if the event source should be removed.
*/
*
* Returns: %FALSE if the event source should be removed.
*/
-typedef gboolean (*GstBusFunc) (GstBus * bus, GstMessage * message, gpointer data);
+typedef gboolean (*GstBusFunc) (GstBus * bus, GstMessage * message, gpointer
user_
data);
/**
* GstBus:
/**
* GstBus:
@@
-116,16
+115,6
@@
struct _GstBus
GstObject object;
/*< private >*/
GstObject object;
/*< private >*/
- GstAtomicQueue *queue;
- GMutex *queue_lock;
-
- GstBusSyncHandler sync_handler;
- gpointer sync_handler_data;
-
- guint signal_watch_id;
- guint num_signal_watchers;
-
- /*< private >*/
GstBusPrivate *priv;
gpointer _gst_reserved[GST_PADDING];
GstBusPrivate *priv;
gpointer _gst_reserved[GST_PADDING];
@@
-159,7
+148,7
@@
void gst_bus_set_flushing (GstBus * bus, gboolean
/* synchronous dispatching */
void gst_bus_set_sync_handler (GstBus * bus, GstBusSyncHandler func,
/* synchronous dispatching */
void gst_bus_set_sync_handler (GstBus * bus, GstBusSyncHandler func,
- gpointer
data
);
+ gpointer
user_data, GDestroyNotify notify
);
/* GSource based dispatching */
GSource * gst_bus_create_watch (GstBus * bus);
guint gst_bus_add_watch_full (GstBus * bus,
/* GSource based dispatching */
GSource * gst_bus_create_watch (GstBus * bus);
guint gst_bus_add_watch_full (GstBus * bus,
@@
-173,7
+162,7
@@
guint gst_bus_add_watch (GstBus * bus,
/* polling the bus */
GstMessage* gst_bus_poll (GstBus *bus, GstMessageType events,
/* polling the bus */
GstMessage* gst_bus_poll (GstBus *bus, GstMessageType events,
- GstClockTime
Diff
timeout);
+ GstClockTime timeout);
/* signal based dispatching helper functions. */
gboolean gst_bus_async_signal_func (GstBus *bus, GstMessage *message,
/* signal based dispatching helper functions. */
gboolean gst_bus_async_signal_func (GstBus *bus, GstMessage *message,