mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-19 08:11:16 +00:00
gst/gstelement.h: Don't GST_ERROR_OBJECT smpty strings - Solaris doesn't like NULL strings.
Original commit message from CVS: * gst/gstelement.h: Don't GST_ERROR_OBJECT smpty strings - Solaris doesn't like NULL strings. * gst/gstelement.c (gst_element_class_init): GError's are boxed, not objects * gst/gstmarshal.list: update list for the fixed error signal
This commit is contained in:
parent
3e53c7f757
commit
ae23ffba6f
4 changed files with 15 additions and 2 deletions
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
|||
2004-07-15 Benjamin Otte <otte@gnome.org>
|
||||
|
||||
* gst/gstelement.h:
|
||||
Don't GST_ERROR_OBJECT smpty strings - Solaris doesn't like NULL
|
||||
strings.
|
||||
* gst/gstelement.c (gst_element_class_init):
|
||||
GError's are boxed, not objects
|
||||
* gst/gstmarshal.list:
|
||||
update list for the fixed error signal
|
||||
|
||||
2004-07-14 Andy Wingo <wingo@pobox.com>
|
||||
|
||||
* gst/gsttag.c: Add a tag merge func for pointers. The header was
|
||||
|
|
|
@ -139,7 +139,7 @@ gst_element_class_init (GstElementClass * klass)
|
|||
gst_element_signals[ERROR] =
|
||||
g_signal_new ("error", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (GstElementClass, error), NULL, NULL,
|
||||
gst_marshal_VOID__OBJECT_OBJECT_STRING, G_TYPE_NONE, 3, GST_TYPE_ELEMENT,
|
||||
gst_marshal_VOID__OBJECT_BOXED_STRING, G_TYPE_NONE, 3, GST_TYPE_ELEMENT,
|
||||
GST_TYPE_G_ERROR, G_TYPE_STRING);
|
||||
gst_element_signals[EOS] =
|
||||
g_signal_new ("eos", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
|
||||
|
|
|
@ -143,7 +143,9 @@ typedef enum {
|
|||
#define GST_ELEMENT_ERROR(el, domain, code, message, debug) G_STMT_START { \
|
||||
gchar *__msg = _gst_element_error_printf message; \
|
||||
gchar *__dbg = _gst_element_error_printf debug; \
|
||||
GST_ERROR_OBJECT (el, "%s", __msg); \
|
||||
if (__msg) \
|
||||
GST_ERROR_OBJECT (el, "%s", __msg); \
|
||||
if (__dbg) \
|
||||
GST_ERROR_OBJECT (el, "%s", __dbg); \
|
||||
gst_element_error_full (GST_ELEMENT(el), \
|
||||
GST_ ## domain ## _ERROR, GST_ ## domain ## _ERROR_ ## code, \
|
||||
|
|
|
@ -9,6 +9,7 @@ VOID:OBJECT
|
|||
VOID:OBJECT,PARAM
|
||||
VOID:OBJECT,POINTER
|
||||
VOID:OBJECT,BOXED
|
||||
VOID:OBJECT,BOXED,STRING
|
||||
VOID:OBJECT,OBJECT,STRING
|
||||
VOID:OBJECT,STRING
|
||||
VOID:INT,INT
|
||||
|
|
Loading…
Reference in a new issue