mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 14:56:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

element: fix GST_ELEMENT_ERROR() error code expansion

Browse source 
In some corner cases, the error 'code' part passed to
GST_ELEMENT_ERROR() is a valid define as well, in which
case it won't survive two levels of macro expansion, but
only one. Fixes:

oss4-sink.c: In function ‘gst_oss4_sink_open’:
error: ‘GST_RESOURCE_ERROR_0x00000002’ undeclared (first use in this function)
GST_ ## domain ## _ERROR_ ## code, __txt, __dbg, __FILE__,

which is from GST_ELEMENT_ERROR(el,RESOURCE,OPEN_WRITE,..)
and OPEN_WRITE happens to be defined to 2 here.

https://bugzilla.gnome.org/show_bug.cgi?id=756806
https://bugzilla.gnome.org/show_bug.cgi?id=769117
This commit is contained in:
Tim-Philipp Müller 2016-07-24 01:35:41 +01:00
parent 12a10980b3
commit d052ae63d8
1 changed files with 38 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
gst/gstelement.h
View file

@ -421,7 +421,7 @@ GstStructure *gst_element_message_details_new(const char *name, ...);
* *
* Since: 1.10 * Since: 1.10
*/ */
#define GST_ELEMENT_ERROR_WITH_DETAILS(el, domain, code, text, debug, args) \ #define GST_ELEMENT_ERROR_WITH_DETAILS(el,domain,code,text,debug,args) \
G_STMT_START { \ G_STMT_START { \
gchar *__txt = _gst_element_error_printf text; \ gchar *__txt = _gst_element_error_printf text; \
gchar *__dbg = _gst_element_error_printf debug; \ gchar *__dbg = _gst_element_error_printf debug; \
@ -449,8 +449,19 @@ G_STMT_START { \
* data processing error. The pipeline will post an error message and the * data processing error. The pipeline will post an error message and the
* application will be requested to stop further media processing. * application will be requested to stop further media processing.
*/ */
#define GST_ELEMENT_ERROR(el, domain, code, text, debug) \ #define GST_ELEMENT_ERROR(el,domain,code,text,debug) \
GST_ELEMENT_ERROR_WITH_DETAILS(el, domain, code, text, debug, (NULL)) G_STMT_START { \
gchar *__txt = _gst_element_error_printf text; \
gchar *__dbg = _gst_element_error_printf debug; \
if (__txt) \
GST_WARNING_OBJECT (el, "error: %s", __txt); \
if (__dbg) \
GST_WARNING_OBJECT (el, "error: %s", __dbg); \
gst_element_message_full (GST_ELEMENT(el), \
GST_MESSAGE_ERROR, GST_ ## domain ## _ERROR, \
GST_ ## domain ## _ERROR_ ## code, __txt, __dbg, __FILE__, \
GST_FUNCTION, __LINE__); \
} G_STMT_END
/** /**
* GST_ELEMENT_WARNING_WITH_DETAILS: * GST_ELEMENT_WARNING_WITH_DETAILS:
@ -500,7 +511,18 @@ G_STMT_START { \
* application will be informed. * application will be informed.
*/ */
#define GST_ELEMENT_WARNING(el, domain, code, text, debug) \ #define GST_ELEMENT_WARNING(el, domain, code, text, debug) \
GST_ELEMENT_WARNING_WITH_DETAILS(el, domain, code, text, debug, (NULL)) G_STMT_START { \
gchar *__txt = _gst_element_error_printf text; \
gchar *__dbg = _gst_element_error_printf debug; \
if (__txt) \
GST_WARNING_OBJECT (el, "warning: %s", __txt); \
if (__dbg) \
GST_WARNING_OBJECT (el, "warning: %s", __dbg); \
gst_element_message_full (GST_ELEMENT(el), \
GST_MESSAGE_WARNING, GST_ ## domain ## _ERROR, \
GST_ ## domain ## _ERROR_ ## code, __txt, __dbg, __FILE__, \
GST_FUNCTION, __LINE__); \
} G_STMT_END
/** /**
* GST_ELEMENT_INFO_WITH_DETAILS: * GST_ELEMENT_INFO_WITH_DETAILS:
@ -554,7 +576,18 @@ G_STMT_START { \
* application will be informed. * application will be informed.
*/ */
#define GST_ELEMENT_INFO(el, domain, code, text, debug) \ #define GST_ELEMENT_INFO(el, domain, code, text, debug) \
GST_ELEMENT_INFO_WITH_DETAILS(el, domain, code, text, debug, (NULL)) G_STMT_START { \
gchar *__txt = _gst_element_error_printf text; \
gchar *__dbg = _gst_element_error_printf debug; \
if (__txt) \
GST_INFO_OBJECT (el, "info: %s", __txt); \
if (__dbg) \
GST_INFO_OBJECT (el, "info: %s", __dbg); \
gst_element_message_full (GST_ELEMENT(el), \
GST_MESSAGE_INFO, GST_ ## domain ## _ERROR, \
GST_ ## domain ## _ERROR_ ## code, __txt, __dbg, __FILE__, \
GST_FUNCTION, __LINE__); \
} G_STMT_END
/* the state change mutexes and conds */ /* the state change mutexes and conds */
/** /**